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

Resolve "Failing karma tests for Chrome 60"

Closes #36517

See merge request !13646
This commit is contained in:
Tim Zallmann 2017-08-21 07:18:44 +00:00
commit 955d684cde
3 changed files with 8 additions and 3 deletions

View File

@ -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"

View File

@ -30,6 +30,8 @@ describe('Issue boards new issue form', () => {
};
beforeEach((done) => {
setFixtures('<div class="test-container"></div>');
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()

View File

@ -52,6 +52,7 @@ describe('text_utility', () => {
beforeAll(() => {
textArea = document.createElement('textarea');
document.querySelector('body').appendChild(textArea);
textArea.focus();
});
afterAll(() => {