Skip to content

G
gitlab-ce
Commit 4f0b2079 authored by Tim Zallmann's avatar Tim Zallmann Committed by Clement Ho
Browse files
Options

Upgraded Vue to 2.6.8 

Upgrade to latest Version
parent 04431d5e
Show whitespace changes
Inline Side-by-side
Showing with 122 additions and 140 deletions
app/assets/javascripts/notifications_dropdown.js
View file @ 4f0b2079
...@@ -4,6 +4,7 @@ import Flash from './flash'; ...@@ -4,6 +4,7 @@ import Flash from './flash';
export default function notificationsDropdown() { export default function notificationsDropdown() {
$(document).on('click', '.update-notification', function updateNotificationCallback(e) { $(document).on('click', '.update-notification', function updateNotificationCallback(e) {
e.preventDefault(); e.preventDefault();
if ($(this).is('.is-active') && $(this).data('notificationLevel') === 'custom') { if ($(this).is('.is-active') && $(this).data('notificationLevel') === 'custom') {
return; return;
} }
......
spec/javascripts/ide/components/error_message_spec.js
View file @ 4f0b2079
...@@ -84,7 +84,7 @@ describe('IDE error message component', () => { ...@@ -84,7 +84,7 @@ describe('IDE error message component', () => {
expect(vm.isLoading).toBe(true); expect(vm.isLoading).toBe(true);
vm.$nextTick(() => { setTimeout(() => {
expect(vm.isLoading).toBe(false); expect(vm.isLoading).toBe(false);
done(); done();
......
spec/javascripts/ide/stores/actions/file_spec.js
View file @ 4f0b2079
...@@ -121,68 +121,48 @@ describe('IDE store file actions', () => { ...@@ -121,68 +121,48 @@ describe('IDE store file actions', () => {
store._actions.scrollToTab = oldScrollToTab; // eslint-disable-line store._actions.scrollToTab = oldScrollToTab; // eslint-disable-line
}); });
it('calls scrollToTab', done => { it('calls scrollToTab', () => {
store const dispatch = jasmine.createSpy();
.dispatch('setFileActive', localFile.path)
.then(() => {
expect(scrollToTabSpy).toHaveBeenCalled();
done(); actions.setFileActive(
}) { commit() {}, state: store.state, getters: store.getters, dispatch },
.catch(done.fail); localFile.path,
}); );
it('sets the file active', done => {
store
.dispatch('setFileActive', localFile.path)
.then(() => {
expect(localFile.active).toBeTruthy();
done(); expect(dispatch).toHaveBeenCalledWith('scrollToTab');
})
.catch(done.fail);
}); });
it('returns early if file is already active', done => { it('commits SET_FILE_ACTIVE', () => {
localFile.active = true; const commit = jasmine.createSpy();
store actions.setFileActive(
.dispatch('setFileActive', localFile.path) { commit, state: store.state, getters: store.getters, dispatch() {} },
.then(() => { localFile.path,
expect(scrollToTabSpy).not.toHaveBeenCalled(); );
done(); expect(commit).toHaveBeenCalledWith('SET_FILE_ACTIVE', {
}) path: localFile.path,
.catch(done.fail); active: true,
});
}); });
it('sets current active file to not active', done => { it('sets current active file to not active', () => {
const f = file('newActive'); const f = file('newActive');
store.state.entries[f.path] = f; store.state.entries[f.path] = f;
localFile.active = true; localFile.active = true;
store.state.openFiles.push(localFile); store.state.openFiles.push(localFile);
store const commit = jasmine.createSpy();
.dispatch('setFileActive', f.path)
.then(() => {
expect(localFile.active).toBeFalsy();
done();
})
.catch(done.fail);
});
it('resets location.hash for line highlighting', done => {
window.location.hash = 'test';
store actions.setFileActive(
.dispatch('setFileActive', localFile.path) { commit, state: store.state, getters: store.getters, dispatch() {} },
.then(() => { f.path,
expect(window.location.hash).not.toBe('test'); );
done(); expect(commit).toHaveBeenCalledWith('SET_FILE_ACTIVE', {
}) path: localFile.path,
.catch(done.fail); active: false,
});
}); });
}); });
......
spec/javascripts/notes/components/note_app_spec.js
View file @ 4f0b2079
...@@ -192,9 +192,9 @@ describe('note_app', () => { ...@@ -192,9 +192,9 @@ describe('note_app', () => {
expect(service.updateNote).toHaveBeenCalled(); expect(service.updateNote).toHaveBeenCalled();
// Wait for the requests to finish before destroying // Wait for the requests to finish before destroying
Vue.nextTick() setTimeout(() => {
.then(done) done();
.catch(done.fail); });
}); });
}); });
...@@ -227,9 +227,9 @@ describe('note_app', () => { ...@@ -227,9 +227,9 @@ describe('note_app', () => {
expect(service.updateNote).toHaveBeenCalled(); expect(service.updateNote).toHaveBeenCalled();
// Wait for the requests to finish before destroying // Wait for the requests to finish before destroying
Vue.nextTick() setTimeout(() => {
.then(done) done();
.catch(done.fail); });
}); });
}); });
}); });
......
spec/javascripts/pipelines/graph/action_component_spec.js
View file @ 4f0b2079
...@@ -55,13 +55,16 @@ describe('pipeline graph action component', () => { ...@@ -55,13 +55,16 @@ describe('pipeline graph action component', () => {
component.$el.click(); component.$el.click();
setTimeout(() => {
component component
.$nextTick() .$nextTick()
.then(() => { .then(() => {
expect(component.$emit).toHaveBeenCalledWith('pipelineActionRequestComplete'); expect(component.$emit).toHaveBeenCalledWith('pipelineActionRequestComplete');
}) })
.then(done)
.catch(done.fail); .catch(done.fail);
done();
}, 0);
}); });
}); });
}); });
spec/javascripts/pipelines/stage_spec.js
View file @ 4f0b2079
...@@ -120,6 +120,7 @@ describe('Pipelines stage component', () => { ...@@ -120,6 +120,7 @@ describe('Pipelines stage component', () => {
setTimeout(() => { setTimeout(() => {
component.$el.querySelector('.js-ci-action').click(); component.$el.querySelector('.js-ci-action').click();
setTimeout(() => {
component component
.$nextTick() .$nextTick()
.then(() => { .then(() => {
...@@ -128,6 +129,7 @@ describe('Pipelines stage component', () => { ...@@ -128,6 +129,7 @@ describe('Pipelines stage component', () => {
.then(done) .then(done)
.catch(done.fail); .catch(done.fail);
}, 0); }, 0);
}, 0);
}); });
}); });
}); });
......
spec/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown_spec.js
View file @ 4f0b2079
...@@ -53,36 +53,32 @@ describe('GkeProjectIdDropdown', () => { ...@@ -53,36 +53,32 @@ describe('GkeProjectIdDropdown', () => {
}); });
it('returns default toggle text', done => it('returns default toggle text', done =>
vm setTimeout(() => {
.$nextTick()
.then(() => {
vm.setItem(emptyProjectMock); vm.setItem(emptyProjectMock);
expect(vm.toggleText).toBe(LABELS.DEFAULT); expect(vm.toggleText).toBe(LABELS.DEFAULT);
done(); done();
}) }));
.catch(done.fail));
it('returns project name if project selected', done => it('returns project name if project selected', done =>
vm setTimeout(() => {
.$nextTick() vm.isLoading = false;
.then(() => {
expect(vm.toggleText).toBe(selectedProjectMock.name); expect(vm.toggleText).toBe(selectedProjectMock.name);
done(); done();
}) }));
.catch(done.fail));
it('returns empty toggle text', done => it('returns empty toggle text', done =>
vm setTimeout(() => {
.$nextTick()
.then(() => {
vm.$store.commit(SET_PROJECTS, null); vm.$store.commit(SET_PROJECTS, null);
vm.setItem(emptyProjectMock); vm.setItem(emptyProjectMock);
expect(vm.toggleText).toBe(LABELS.EMPTY); expect(vm.toggleText).toBe(LABELS.EMPTY);
done(); done();
}) }));
.catch(done.fail));
}); });
describe('selectItem', () => { describe('selectItem', () => {
......
yarn.lock
View file @ 4f0b2079
...@@ -707,10 +707,10 @@ ...@@ -707,10 +707,10 @@
resolved "https://registry.yarnpkg.com/@types/events/-/events-1.2.0.tgz#81a6731ce4df43619e5c8c945383b3e62a89ea86" resolved "https://registry.yarnpkg.com/@types/events/-/events-1.2.0.tgz#81a6731ce4df43619e5c8c945383b3e62a89ea86"
integrity sha512-KEIlhXnIutzKwRbQkGWb/I4HFqBuUykAdHgDED6xqwXJfONCjF5VoE0cXEiurh3XauygxzeDzgtXUqvLkxFzzA== integrity sha512-KEIlhXnIutzKwRbQkGWb/I4HFqBuUykAdHgDED6xqwXJfONCjF5VoE0cXEiurh3XauygxzeDzgtXUqvLkxFzzA==
"@types/glob@^5": "@types/glob@5 - 7":
version "5.0.35" version "7.1.1"
resolved "https://registry.yarnpkg.com/@types/glob/-/glob-5.0.35.tgz#1ae151c802cece940443b5ac246925c85189f32a" resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575"
integrity sha512-wc+VveszMLyMWFvXLkloixT4n0harUIVZjnpzztaZ0nKLuul7Z32iMt2fUFGAaZ4y1XWjFRMtCI5ewvyh4aIeg== integrity sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==
dependencies: dependencies:
"@types/events" "*" "@types/events" "*"
"@types/minimatch" "*" "@types/minimatch" "*"
...@@ -791,7 +791,7 @@ ...@@ -791,7 +791,7 @@
resolved "https://registry.yarnpkg.com/@types/zen-observable/-/zen-observable-0.8.0.tgz#8b63ab7f1aa5321248aad5ac890a485656dcea4d" resolved "https://registry.yarnpkg.com/@types/zen-observable/-/zen-observable-0.8.0.tgz#8b63ab7f1aa5321248aad5ac890a485656dcea4d"
integrity sha512-te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg== integrity sha512-te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg==
"@vue/component-compiler-utils@^2.0.0", "@vue/component-compiler-utils@^2.4.0": "@vue/component-compiler-utils@^2.4.0", "@vue/component-compiler-utils@^2.5.1":
version "2.6.0" version "2.6.0"
resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-2.6.0.tgz#aa46d2a6f7647440b0b8932434d22f12371e543b" resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-2.6.0.tgz#aa46d2a6f7647440b0b8932434d22f12371e543b"
integrity sha512-IHjxt7LsOFYc0DkTncB7OXJL7UzwOLPPQCfEUNyxL2qt+tF12THV+EO33O1G2Uk4feMSWua3iD39Itszx0f0bw== integrity sha512-IHjxt7LsOFYc0DkTncB7OXJL7UzwOLPPQCfEUNyxL2qt+tF12THV+EO33O1G2Uk4feMSWua3iD39Itszx0f0bw==
...@@ -4546,27 +4546,27 @@ getpass@^0.1.1: ...@@ -4546,27 +4546,27 @@ getpass@^0.1.1:
dependencies: dependencies:
assert-plus "^1.0.0" assert-plus "^1.0.0"
gettext-extractor-vue@^4.0.1: gettext-extractor-vue@^4.0.2:
version "4.0.1" version "4.0.2"
resolved "https://registry.yarnpkg.com/gettext-extractor-vue/-/gettext-extractor-vue-4.0.1.tgz#69d2737eb8f1938803ffcf9317133ed59fb2372f" resolved "https://registry.yarnpkg.com/gettext-extractor-vue/-/gettext-extractor-vue-4.0.2.tgz#16e1cdbdaf37e5bdf3cb0aff63685bdc5e74e906"
integrity sha512-UnkWVO5jQQrs17L7HSlKj3O7U8C4+AQFzE05MK/I+JkMZdQdB6JMjA0IK0c4GObSlkgx4aiCCG6zWqIBnDR95w== integrity sha512-tnTAU1TdQFREv4Q4hfBDuB329eugeFsYmV7lE9U1jkZEyxcf4oPgimLHNZVNaEUg4+JJwhB8B9HIeqbcbSW32g==
dependencies: dependencies:
bluebird "^3.5.1" bluebird "^3.5.1"
glob "^7.1.2" glob "^7.1.2"
vue-template-compiler "^2.5.0" vue-template-compiler "^2.5.20"
gettext-extractor@^3.3.2: gettext-extractor@^3.4.3:
version "3.3.2" version "3.4.3"
resolved "https://registry.yarnpkg.com/gettext-extractor/-/gettext-extractor-3.3.2.tgz#d5172ba8d175678bd40a5abe7f908fa2a9d9473b" resolved "https://registry.yarnpkg.com/gettext-extractor/-/gettext-extractor-3.4.3.tgz#882679cefc71888eb6e69297e6b2dc14c0384fef"
integrity sha1-1RcrqNF1Z4vUClq+f5CPoqnZRzs= integrity sha512-YSNdTCHmzm58Rc21thtXj7jRIOlqINftM3XbtvNK28C88i35EnEB89iOeV9Vetv7wcb/wiPAtcq/6iSnt2pMyw==
dependencies: dependencies:
"@types/glob" "^5" "@types/glob" "5 - 7"
"@types/parse5" "^5" "@types/parse5" "^5"
css-selector-parser "^1.3" css-selector-parser "^1.3"
glob "5 - 7" glob "5 - 7"
parse5 "^5" parse5 "^5"
pofile "^1" pofile "^1"
typescript "^2" typescript "2 - 3"
glob-parent@^3.1.0: glob-parent@^3.1.0:
version "3.1.0" version "3.1.0"
...@@ -10512,10 +10512,10 @@ typedarray@^0.0.6: ...@@ -10512,10 +10512,10 @@ typedarray@^0.0.6:
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
typescript@^2: "typescript@2 - 3":
version "2.9.2" version "3.3.4000"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.2.tgz#1cbf61d05d6b96269244eb6a3bce4bd914e0f00c" resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.3.4000.tgz#76b0f89cfdbf97827e1112d64f283f1151d6adf0"
integrity sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w== integrity sha512-jjOcCZvpkl2+z7JFn0yBOoLQyLoIkNZAs/fYJkUG6VKy6zLPHJGfQJYFHzibB6GJaF/8QrcECtlQ5cpvRHSMEA==
uc.micro@^1.0.1, uc.micro@^1.0.5: uc.micro@^1.0.1, uc.micro@^1.0.5:
version "1.0.5" version "1.0.5"
...@@ -10938,12 +10938,12 @@ vue-jest@^4.0.0-beta.2: ...@@ -10938,12 +10938,12 @@ vue-jest@^4.0.0-beta.2:
source-map "^0.5.6" source-map "^0.5.6"
ts-jest "^23.10.5" ts-jest "^23.10.5"
vue-loader@^15.4.2: vue-loader@^15.4.2, vue-loader@^15.7.0:
version "15.4.2" version "15.7.0"
resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.4.2.tgz#812bb26e447dd3b84c485eb634190d914ce125e2" resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.7.0.tgz#27275aa5a3ef4958c5379c006dd1436ad04b25b3"
integrity sha512-nVV27GNIA9MeoD8yQ3dkUzwlAaAsWeYSWZHsu/K04KCD339lW0Jv2sJWsjj3721SP7sl2lYdPmjcHgkWQSp5bg== integrity sha512-x+NZ4RIthQOxcFclEcs8sXGEWqnZHodL2J9Vq+hUz+TDZzBaDIh1j3d9M2IUlTjtrHTZy4uMuRdTi8BGws7jLA==
dependencies: dependencies:
"@vue/component-compiler-utils" "^2.0.0" "@vue/component-compiler-utils" "^2.5.1"
hash-sum "^1.0.2" hash-sum "^1.0.2"
loader-utils "^1.1.0" loader-utils "^1.1.0"
vue-hot-reload-api "^2.3.0" vue-hot-reload-api "^2.3.0"
...@@ -10969,10 +10969,10 @@ vue-style-loader@^4.1.0: ...@@ -10969,10 +10969,10 @@ vue-style-loader@^4.1.0:
hash-sum "^1.0.2" hash-sum "^1.0.2"
loader-utils "^1.0.2" loader-utils "^1.0.2"
vue-template-compiler@^2.5.0, vue-template-compiler@^2.5.21: vue-template-compiler@^2.5.20, vue-template-compiler@^2.6.10:
version "2.5.21" version "2.6.10"
resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.5.21.tgz#a57ceb903177e8f643560a8d639a0f8db647054a" resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.10.tgz#323b4f3495f04faa3503337a82f5d6507799c9cc"
integrity sha512-Vmk5Cv7UcmI99B9nXJEkaK262IQNnHp5rJYo+EwYpe2epTAXqcVyExhV6pk8jTkxQK2vRc8v8KmZBAwdmUZvvw== integrity sha512-jVZkw4/I/HT5ZMvRnhv78okGusqe0+qH2A0Em0Cp8aq78+NK9TII263CDVz2QXZsIT+yyV/gZc/j/vlwa+Epyg==
dependencies: dependencies:
de-indent "^1.0.2" de-indent "^1.0.2"
he "^1.1.0" he "^1.1.0"
...@@ -10982,20 +10982,20 @@ vue-template-es2015-compiler@^1.9.0: ...@@ -10982,20 +10982,20 @@ vue-template-es2015-compiler@^1.9.0:
resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825" resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825"
integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw== integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==
vue-virtual-scroll-list@^1.2.5: vue-virtual-scroll-list@^1.3.1:
version "1.2.5" version "1.3.1"
resolved "https://registry.yarnpkg.com/vue-virtual-scroll-list/-/vue-virtual-scroll-list-1.2.5.tgz#bcbd010f7cdb035eba8958ebf807c6214d9a167a" resolved "https://registry.yarnpkg.com/vue-virtual-scroll-list/-/vue-virtual-scroll-list-1.3.1.tgz#efcb83d3a3dcc69cd886fa4de1130a65493e8f76"
integrity sha1-vL0BD3zbA166iVjr+AfGIU2aFno= integrity sha512-PMTxiK9/P1LtgoWWw4n1QnmDDkYqIdWWCNdt1L4JD9g6rwDgnsGsSV10bAnd5n7DQLHGWHjRex+zAbjXWT8t0g==
vue@^2.5.21: vue@^2.5.21, vue@^2.6.10:
version "2.5.21" version "2.6.10"
resolved "https://registry.yarnpkg.com/vue/-/vue-2.5.21.tgz#3d33dcd03bb813912ce894a8303ab553699c4a85" resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.10.tgz#a72b1a42a4d82a721ea438d1b6bf55e66195c637"
integrity sha512-Aejvyyfhn0zjVeLvXd70h4hrE4zZDx1wfZqia6ekkobLmUZ+vNFQer53B4fu0EjWBSiqApxPejzkO1Znt3joxQ== integrity sha512-ImThpeNU9HbdZL3utgMCq0oiMzAkt1mcgy3/E6zWC/G6AaQoeuFdsl9nDhTDU3X1R6FK7nsIUuRACVcjI+A2GQ==
vuex@^3.0.1: vuex@^3.1.0:
version "3.0.1" version "3.1.0"
resolved "https://registry.yarnpkg.com/vuex/-/vuex-3.0.1.tgz#e761352ebe0af537d4bb755a9b9dc4be3df7efd2" resolved "https://registry.yarnpkg.com/vuex/-/vuex-3.1.0.tgz#634b81515cf0cfe976bd1ffe9601755e51f843b9"
integrity sha512-wLoqz0B7DSZtgbWL1ShIBBCjv22GV5U+vcBFox658g6V0s4wZV9P4YjCNyoHSyIBpj1f29JBoNQIqD82cR4O3w== integrity sha512-mdHeHT/7u4BncpUZMlxNaIdcN/HIt1GsGG5LKByArvYG/v6DvHcOxvDCts+7SRdCoIRGllK8IMZvQtQXLppDYg==
w3c-hr-time@^1.0.1: w3c-hr-time@^1.0.1:
version "1.0.1" version "1.0.1"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7