Merge branch 'master' into qa/gb/ci-cd-qa-pipelines

* master: (69 commits)

Conflicts:
	qa/qa.rb

1 files changed, 4 insertions, 4 deletions

diff --git a/spec/javascripts/repo/components/repo_file_spec.js b/spec/javascripts/repo/components/repo_file_spec.js
index 0810da87e80..27b55ed1f87 100644
--- a/spec/javascripts/repo/components/repo_file_spec.js
+++ b/spec/javascripts/repo/components/repo_file_spec.js
@@ -25,7 +25,7 @@ describe('RepoFile', () => {
     vm = new RepoFile({
       store,
       propsData: {
-        file: file(),
+        file: file('t4'),
       },
     });
     spyOn(vm, 'timeFormated').and.returnValue(updated);
@@ -39,7 +39,7 @@ describe('RepoFile', () => {
 
   it('does render if hasFiles is true and is loading tree', () => {
     vm = createComponent({
-      file: file(),
+      file: file('t1'),
     });
 
     expect(vm.$el.querySelector('.fa-spin.fa-spinner')).toBeFalsy();
@@ -47,7 +47,7 @@ describe('RepoFile', () => {
 
   it('does not render commit message and datetime if mini', (done) => {
     vm = createComponent({
-      file: file(),
+      file: file('t2'),
     });
     vm.$store.state.openFiles.push(vm.file);
 
@@ -61,7 +61,7 @@ describe('RepoFile', () => {
 
   it('fires clickFile when the link is clicked', () => {
     vm = createComponent({
-      file: file(),
+      file: file('t3'),
     });
 
     spyOn(vm, 'clickFile');