Upgraded Vue to 2.6.8

Upgrade to latest Version

6 files changed, 73 insertions, 92 deletions

diff --git a/spec/javascripts/ide/components/error_message_spec.js b/spec/javascripts/ide/components/error_message_spec.js
index 430e8e2baa3..80d6c7fd564 100644
--- a/spec/javascripts/ide/components/error_message_spec.js
+++ b/spec/javascripts/ide/components/error_message_spec.js
@@ -84,7 +84,7 @@ describe('IDE error message component', () => {
 
       expect(vm.isLoading).toBe(true);
 
-      vm.$nextTick(() => {
+      setTimeout(() => {
         expect(vm.isLoading).toBe(false);
 
         done();
diff --git a/spec/javascripts/ide/stores/actions/file_spec.js b/spec/javascripts/ide/stores/actions/file_spec.js
index 7ddc734ff56..1e5b55af4ba 100644
--- a/spec/javascripts/ide/stores/actions/file_spec.js
+++ b/spec/javascripts/ide/stores/actions/file_spec.js
@@ -121,68 +121,48 @@ describe('IDE store file actions', () => {
       store._actions.scrollToTab = oldScrollToTab; // eslint-disable-line
     });
 
-    it('calls scrollToTab', done => {
-      store
-        .dispatch('setFileActive', localFile.path)
-        .then(() => {
-          expect(scrollToTabSpy).toHaveBeenCalled();
-
-          done();
-        })
-        .catch(done.fail);
-    });
+    it('calls scrollToTab', () => {
+      const dispatch = jasmine.createSpy();
 
-    it('sets the file active', done => {
-      store
-        .dispatch('setFileActive', localFile.path)
-        .then(() => {
-          expect(localFile.active).toBeTruthy();
+      actions.setFileActive(
+        { commit() {}, state: store.state, getters: store.getters, dispatch },
+        localFile.path,
+      );
 
-          done();
-        })
-        .catch(done.fail);
+      expect(dispatch).toHaveBeenCalledWith('scrollToTab');
     });
 
-    it('returns early if file is already active', done => {
-      localFile.active = true;
+    it('commits SET_FILE_ACTIVE', () => {
+      const commit = jasmine.createSpy();
 
-      store
-        .dispatch('setFileActive', localFile.path)
-        .then(() => {
-          expect(scrollToTabSpy).not.toHaveBeenCalled();
+      actions.setFileActive(
+        { commit, state: store.state, getters: store.getters, dispatch() {} },
+        localFile.path,
+      );
 
-          done();
-        })
-        .catch(done.fail);
+      expect(commit).toHaveBeenCalledWith('SET_FILE_ACTIVE', {
+        path: localFile.path,
+        active: true,
+      });
     });
 
-    it('sets current active file to not active', done => {
+    it('sets current active file to not active', () => {
       const f = file('newActive');
       store.state.entries[f.path] = f;
       localFile.active = true;
       store.state.openFiles.push(localFile);
 
-      store
-        .dispatch('setFileActive', f.path)
-        .then(() => {
-          expect(localFile.active).toBeFalsy();
+      const commit = jasmine.createSpy();
 
-          done();
-        })
-        .catch(done.fail);
-    });
-
-    it('resets location.hash for line highlighting', done => {
-      window.location.hash = 'test';
-
-      store
-        .dispatch('setFileActive', localFile.path)
-        .then(() => {
-          expect(window.location.hash).not.toBe('test');
+      actions.setFileActive(
+        { commit, state: store.state, getters: store.getters, dispatch() {} },
+        f.path,
+      );
 
-          done();
-        })
-        .catch(done.fail);
+      expect(commit).toHaveBeenCalledWith('SET_FILE_ACTIVE', {
+        path: localFile.path,
+        active: false,
+      });
     });
   });
 
diff --git a/spec/javascripts/notes/components/note_app_spec.js b/spec/javascripts/notes/components/note_app_spec.js
index d716ece3766..ef876dc2941 100644
--- a/spec/javascripts/notes/components/note_app_spec.js
+++ b/spec/javascripts/notes/components/note_app_spec.js
@@ -192,9 +192,9 @@ describe('note_app', () => {
 
         expect(service.updateNote).toHaveBeenCalled();
         // Wait for the requests to finish before destroying
-        Vue.nextTick()
-          .then(done)
-          .catch(done.fail);
+        setTimeout(() => {
+          done();
+        });
       });
     });
 
@@ -227,9 +227,9 @@ describe('note_app', () => {
 
         expect(service.updateNote).toHaveBeenCalled();
         // Wait for the requests to finish before destroying
-        Vue.nextTick()
-          .then(done)
-          .catch(done.fail);
+        setTimeout(() => {
+          done();
+        });
       });
     });
   });
diff --git a/spec/javascripts/pipelines/graph/action_component_spec.js b/spec/javascripts/pipelines/graph/action_component_spec.js
index 3d2232ff239..95717d659b8 100644
--- a/spec/javascripts/pipelines/graph/action_component_spec.js
+++ b/spec/javascripts/pipelines/graph/action_component_spec.js
@@ -55,13 +55,16 @@ describe('pipeline graph action component', () => {
 
       component.$el.click();
 
-      component
-        .$nextTick()
-        .then(() => {
-          expect(component.$emit).toHaveBeenCalledWith('pipelineActionRequestComplete');
-        })
-        .then(done)
-        .catch(done.fail);
+      setTimeout(() => {
+        component
+          .$nextTick()
+          .then(() => {
+            expect(component.$emit).toHaveBeenCalledWith('pipelineActionRequestComplete');
+          })
+          .catch(done.fail);
+
+        done();
+      }, 0);
     });
   });
 });
diff --git a/spec/javascripts/pipelines/stage_spec.js b/spec/javascripts/pipelines/stage_spec.js
index 3c8b8032de8..19ae7860333 100644
--- a/spec/javascripts/pipelines/stage_spec.js
+++ b/spec/javascripts/pipelines/stage_spec.js
@@ -120,13 +120,15 @@ describe('Pipelines stage component', () => {
 
         setTimeout(() => {
           component.$el.querySelector('.js-ci-action').click();
-          component
-            .$nextTick()
-            .then(() => {
-              expect(eventHub.$emit).toHaveBeenCalledWith('refreshPipelinesTable');
-            })
-            .then(done)
-            .catch(done.fail);
+          setTimeout(() => {
+            component
+              .$nextTick()
+              .then(() => {
+                expect(eventHub.$emit).toHaveBeenCalledWith('refreshPipelinesTable');
+              })
+              .then(done)
+              .catch(done.fail);
+          }, 0);
         }, 0);
       });
     });
diff --git a/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown_spec.js b/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown_spec.js
index 030662b4d90..1eb7cb4bd5b 100644
--- a/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown_spec.js
+++ b/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown_spec.js
@@ -53,36 +53,32 @@ describe('GkeProjectIdDropdown', () => {
     });
 
     it('returns default toggle text', done =>
-      vm
-        .$nextTick()
-        .then(() => {
-          vm.setItem(emptyProjectMock);
+      setTimeout(() => {
+        vm.setItem(emptyProjectMock);
 
-          expect(vm.toggleText).toBe(LABELS.DEFAULT);
-          done();
-        })
-        .catch(done.fail));
+        expect(vm.toggleText).toBe(LABELS.DEFAULT);
+
+        done();
+      }));
 
     it('returns project name if project selected', done =>
-      vm
-        .$nextTick()
-        .then(() => {
-          expect(vm.toggleText).toBe(selectedProjectMock.name);
-          done();
-        })
-        .catch(done.fail));
+      setTimeout(() => {
+        vm.isLoading = false;
+
+        expect(vm.toggleText).toBe(selectedProjectMock.name);
+
+        done();
+      }));
 
     it('returns empty toggle text', done =>
-      vm
-        .$nextTick()
-        .then(() => {
-          vm.$store.commit(SET_PROJECTS, null);
-          vm.setItem(emptyProjectMock);
+      setTimeout(() => {
+        vm.$store.commit(SET_PROJECTS, null);
+        vm.setItem(emptyProjectMock);
 
-          expect(vm.toggleText).toBe(LABELS.EMPTY);
-          done();
-        })
-        .catch(done.fail));
+        expect(vm.toggleText).toBe(LABELS.EMPTY);
+
+        done();
+      }));
   });
 
   describe('selectItem', () => {