From ac526dced282bc54946b529bf89aff6a6b16fe26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=A4=96=20GitLab=20Bot=20=F0=9F=A4=96?= <gitlab-bot@gitlab.com> Date: Fri, 2 Oct 2020 14:34:35 +0000 Subject: [PATCH] Update dependency vue-router to ^3.4.5 --- .../components/first_class_vulnerability_filters_spec.js | 3 ++- package.json | 2 +- spec/frontend/design_management/pages/index_spec.js | 1 - yarn.lock | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ee/spec/frontend/security_dashboard/components/first_class_vulnerability_filters_spec.js b/ee/spec/frontend/security_dashboard/components/first_class_vulnerability_filters_spec.js index 649e760bb401a..7e9a5aec3426e 100644 --- a/ee/spec/frontend/security_dashboard/components/first_class_vulnerability_filters_spec.js +++ b/ee/spec/frontend/security_dashboard/components/first_class_vulnerability_filters_spec.js @@ -137,7 +137,8 @@ describe('First class vulnerability filters component', () => { propsData: { projects }, listeners: { filterChange: filterChangeSpy }, }); - + // reset the router query in-between test cases + router.push({ query: {} }); router.push({ query: { [filter]: value.split(',') } }, () => {}); }); diff --git a/package.json b/package.json index 136ce0d7062d7..402df61478900 100644 --- a/package.json +++ b/package.json @@ -147,7 +147,7 @@ "vue": "^2.6.12", "vue-apollo": "^3.0.3", "vue-loader": "^15.9.3", - "vue-router": "^3.4.3", + "vue-router": "^3.4.5", "vue-template-compiler": "^2.6.12", "vue-virtual-scroll-list": "^1.4.4", "vuedraggable": "^2.23.0", diff --git a/spec/frontend/design_management/pages/index_spec.js b/spec/frontend/design_management/pages/index_spec.js index f625cd3f018c2..55ccb668e81df 100644 --- a/spec/frontend/design_management/pages/index_spec.js +++ b/spec/frontend/design_management/pages/index_spec.js @@ -653,7 +653,6 @@ describe('Design management index page', () => { it('ensures fullscreen layout is not applied', () => { createComponent(true); - wrapper.vm.$router.push('/'); expect(mockPageEl.classList.remove).toHaveBeenCalledTimes(1); expect(mockPageEl.classList.remove).toHaveBeenCalledWith(...DESIGN_DETAIL_LAYOUT_CLASSLIST); }); diff --git a/yarn.lock b/yarn.lock index 5280f59a5d1ba..3532ccc6beb2a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12264,10 +12264,10 @@ vue-loader@^15.9.3: vue-hot-reload-api "^2.3.0" vue-style-loader "^4.1.0" -vue-router@^3.4.3: - version "3.4.3" - resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.4.3.tgz#fa93768616ee338aa174f160ac965167fa572ffa" - integrity sha512-BADg1mjGWX18Dpmy6bOGzGNnk7B/ZA0RxuA6qedY/YJwirMfKXIDzcccmHbQI0A6k5PzMdMloc0ElHfyOoX35A== +vue-router@^3.4.5: + version "3.4.5" + resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.4.5.tgz#d396ec037b35931bdd1e9b7edd86f9788dc15175" + integrity sha512-ioRY5QyDpXM9TDjOX6hX79gtaMXSVDDzSlbIlyAmbHNteIL81WIVB2e+jbzV23vzxtoV0krdS2XHm+GxFg+Nxg== vue-runtime-helpers@^1.1.2: version "1.1.2" -- GitLab