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

Resolve "Failing karma tests for Chrome 60"

Closes #36517

See merge request !13646

2 files changed, 7 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('<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()
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(() => {