Commit 955d684c authored by Tim Zallmann's avatar Tim Zallmann

Merge branch '36517-failing-karma-tests-for-chrome-60' into 'master'

Resolve "Failing karma tests for Chrome 60"

Closes #36517

See merge request !13646
parents 9279bf23 907d7410
...@@ -522,7 +522,7 @@ karma: ...@@ -522,7 +522,7 @@ karma:
<<: *dedicated-runner <<: *dedicated-runner
<<: *except-docs <<: *except-docs
<<: *pull-cache <<: *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 stage: test
variables: variables:
BABEL_ENV: "coverage" BABEL_ENV: "coverage"
......
...@@ -30,6 +30,8 @@ describe('Issue boards new issue form', () => { ...@@ -30,6 +30,8 @@ describe('Issue boards new issue form', () => {
}; };
beforeEach((done) => { beforeEach((done) => {
setFixtures('<div class="test-container"></div>');
const BoardNewIssueComp = Vue.extend(boardNewIssue); const BoardNewIssueComp = Vue.extend(boardNewIssue);
Vue.http.interceptors.push(boardsMockInterceptor); Vue.http.interceptors.push(boardsMockInterceptor);
...@@ -46,15 +48,17 @@ describe('Issue boards new issue form', () => { ...@@ -46,15 +48,17 @@ describe('Issue boards new issue form', () => {
propsData: { propsData: {
list, list,
}, },
}).$mount(); }).$mount(document.querySelector('.test-container'));
Vue.nextTick() Vue.nextTick()
.then(done) .then(done)
.catch(done.fail); .catch(done.fail);
}); });
afterEach(() => vm.$destroy());
it('calls submit if submit button is clicked', (done) => { it('calls submit if submit button is clicked', (done) => {
spyOn(vm, 'submit'); spyOn(vm, 'submit').and.callFake(e => e.preventDefault());
vm.title = 'Testing Title'; vm.title = 'Testing Title';
Vue.nextTick() Vue.nextTick()
......
...@@ -52,6 +52,7 @@ describe('text_utility', () => { ...@@ -52,6 +52,7 @@ describe('text_utility', () => {
beforeAll(() => { beforeAll(() => {
textArea = document.createElement('textarea'); textArea = document.createElement('textarea');
document.querySelector('body').appendChild(textArea); document.querySelector('body').appendChild(textArea);
textArea.focus();
}); });
afterAll(() => { afterAll(() => {
......
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