From e289b8cccb4ad5b7feb7253b6af86bbe3b308614 Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Thu, 17 Aug 2017 23:42:28 -0500 Subject: [PATCH 1/3] fix test failures in board_new_issue_spec.js on Chrome 60 --- spec/javascripts/boards/board_new_issue_spec.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/spec/javascripts/boards/board_new_issue_spec.js b/spec/javascripts/boards/board_new_issue_spec.js index c0a7323a505..eac2eecb6bc 100644 --- a/spec/javascripts/boards/board_new_issue_spec.js +++ b/spec/javascripts/boards/board_new_issue_spec.js @@ -30,6 +30,8 @@ describe('Issue boards new issue form', () => { }; beforeEach((done) => { + setFixtures('
'); + const BoardNewIssueComp = Vue.extend(boardNewIssue); Vue.http.interceptors.push(boardsMockInterceptor); @@ -46,15 +48,17 @@ describe('Issue boards new issue form', () => { propsData: { list, }, - }).$mount(); + }).$mount(document.querySelector('.test-container')); Vue.nextTick() .then(done) .catch(done.fail); }); + afterEach(() => vm.$destroy()); + it('calls submit if submit button is clicked', (done) => { - spyOn(vm, 'submit'); + spyOn(vm, 'submit').and.callFake(e => e.preventDefault()); vm.title = 'Testing Title'; Vue.nextTick() From 2f35a266e1616bc7dea93bdd5c6e50e212ab9ae8 Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Fri, 18 Aug 2017 02:44:08 -0500 Subject: [PATCH 2/3] fix test failures in text_utility_spec.js on Chrome 60 --- spec/javascripts/lib/utils/text_utility_spec.js | 1 + 1 file changed, 1 insertion(+) diff --git a/spec/javascripts/lib/utils/text_utility_spec.js b/spec/javascripts/lib/utils/text_utility_spec.js index ca1b1b7cc3c..f1a975ba962 100644 --- a/spec/javascripts/lib/utils/text_utility_spec.js +++ b/spec/javascripts/lib/utils/text_utility_spec.js @@ -52,6 +52,7 @@ describe('text_utility', () => { beforeAll(() => { textArea = document.createElement('textarea'); document.querySelector('body').appendChild(textArea); + textArea.focus(); }); afterAll(() => { From 907d7410f4ec581efb41d58a30d0e62e8549a70e Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Fri, 18 Aug 2017 03:09:39 -0500 Subject: [PATCH 3/3] update karma CI build image to Chrome 60 --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index df7244d5a2e..3338304ab31 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -522,7 +522,7 @@ karma: <<: *dedicated-runner <<: *except-docs <<: *pull-cache - image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.3.3-golang-1.8-git-2.13-chrome-59.0-node-7.1-postgresql-9.6" + image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.3.3-golang-1.8-git-2.13-chrome-60.0-node-7.1-postgresql-9.6" stage: test variables: BABEL_ENV: "coverage"