Improved the specform-focus-previous-incorrect-form

Now correctly tests against different forms

1 files changed, 25 insertions, 9 deletions

diff --git a/spec/javascripts/shortcuts_spec.js b/spec/javascripts/shortcuts_spec.js
index 9dd7bc5b42c..9b8373df29e 100644
--- a/spec/javascripts/shortcuts_spec.js
+++ b/spec/javascripts/shortcuts_spec.js
@@ -1,29 +1,45 @@
 /* global Shortcuts */
 describe('Shortcuts', () => {
-  const fixtureName = 'issues/open-issue.html.raw';
+  const fixtureName = 'issues/issue_with_comment.html.raw';
+  const createEvent = (type, target) => $.Event(type, {
+    target,
+  });
 
   preloadFixtures(fixtureName);
 
   describe('toggleMarkdownPreview', () => {
     let sc;
-    let event;
 
     beforeEach(() => {
       loadFixtures(fixtureName);
 
-      spyOnEvent('.js-md-preview-button', 'focus');
-
-      event = $.Event('', {
-        target: document.querySelector('.js-note-text'),
-      });
+      spyOnEvent('.js-new-note-form .js-md-preview-button', 'focus');
+      spyOnEvent('.edit-note .js-md-preview-button', 'focus');
 
       sc = new Shortcuts();
     });
 
     it('focuses preview button in form', () => {
-      sc.toggleMarkdownPreview(event);
+      sc.toggleMarkdownPreview(
+        createEvent('KeyboardEvent', document.querySelector('.js-new-note-form .js-note-text'),
+      ));
+
+      expect('focus').toHaveBeenTriggeredOn('.js-new-note-form .js-md-preview-button');
+    });
 
-      expect('focus').toHaveBeenTriggeredOn('.js-md-preview-button');
+    it('focues preview button inside edit comment form', (done) => {
+      document.querySelector('.js-note-edit').click();
+
+      setTimeout(() => {
+        sc.toggleMarkdownPreview(
+          createEvent('KeyboardEvent', document.querySelector('.edit-note .js-note-text'),
+        ));
+
+        expect('focus').not.toHaveBeenTriggeredOn('.js-new-note-form .js-md-preview-button');
+        expect('focus').toHaveBeenTriggeredOn('.edit-note .js-md-preview-button');
+
+        done();
+      });
     });
   });
 });