Update unit tests

4 files changed, 81 insertions, 36 deletions

diff --git a/app/assets/javascripts/comment_type_toggle.js b/app/assets/javascripts/comment_type_toggle.js
index 4578c3a4ec0..34878f90050 100644
--- a/app/assets/javascripts/comment_type_toggle.js
+++ b/app/assets/javascripts/comment_type_toggle.js
@@ -1,5 +1,5 @@
-import DropLab from '@gitlab-org/droplab';
-import InputSetter from '@gitlab-org/droplab/dist/plugins/InputSetter';
+import DropLab from '~/droplab/drop_lab';
+import InputSetter from '~/droplab/plugins/input_setter';
 
 class CommentTypeToggle {
   constructor(dropdownTrigger, dropdownList, noteTypeInput, submitButton, closeButton) {
@@ -33,7 +33,7 @@ class CommentTypeToggle {
     }
 
     this.droplab.init(this.dropdownTrigger, this.dropdownList, [InputSetter], {
-      InputSetter: inputSetterConfig
+      InputSetter: inputSetterConfig,
     });
   }
 }
diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js
index e2fec904d71..66e89b7607a 100644
--- a/app/assets/javascripts/notes.js
+++ b/app/assets/javascripts/notes.js
@@ -738,7 +738,7 @@ require('./task_list');
 
     Notes.prototype.replyToDiscussionNote = function(e) {
       var form, replyLink;
-      form =  this.cleanForm(this.formClone.clone());
+      form = this.cleanForm(this.formClone.clone());
       replyLink = $(e.target).closest(".js-discussion-reply-button");
       // insert the form after the button
       replyLink
@@ -1060,7 +1060,7 @@ require('./task_list');
         .remove();
 
       return $form;
-    }
+    };
 
     return Notes;
   })();
diff --git a/spec/features/merge_requests/discussion_spec.rb b/spec/features/merge_requests/discussions_spec.rb
index 1288584749d..1288584749d 100644
--- a/spec/features/merge_requests/discussion_spec.rb
+++ b/spec/features/merge_requests/discussions_spec.rb
diff --git a/spec/javascripts/comment_type_toggle_spec.js b/spec/javascripts/comment_type_toggle_spec.js
index d68c221f0ea..818c1635710 100644
--- a/spec/javascripts/comment_type_toggle_spec.js
+++ b/spec/javascripts/comment_type_toggle_spec.js
@@ -1,79 +1,124 @@
 import CommentTypeToggle from '~/comment_type_toggle';
-import DropLab from '@gitlab-org/droplab';
-import InputSetter from '@gitlab-org/droplab/dist/plugins/InputSetter';
+import * as dropLabSrc from '~/droplab/drop_lab';
+import InputSetter from '~/droplab/plugins/input_setter';
 
 describe('CommentTypeToggle', function () {
   describe('class constructor', function () {
     beforeEach(function () {
-      this.trigger = {};
-      this.list = {};
-      this.input = {};
-      this.button = {};
+      this.dropdownTrigger = {};
+      this.dropdownList = {};
+      this.noteTypeInput = {};
+      this.submitButton = {};
+      this.closeButton = {};
 
       this.commentTypeToggle = new CommentTypeToggle(
-        this.trigger,
-        this.list,
-        this.input,
-        this.button,
+        this.dropdownTrigger,
+        this.dropdownList,
+        this.noteTypeInput,
+        this.submitButton,
+        this.closeButton,
       );
     });
 
-    it('should set .trigger', function () {
-      expect(this.commentTypeToggle.trigger).toBe(this.trigger);
+    it('should set .dropdownTrigger', function () {
+      expect(this.commentTypeToggle.dropdownTrigger).toBe(this.dropdownTrigger);
     });
 
-    it('should set .list', function () {
-      expect(this.commentTypeToggle.list).toBe(this.list);
+    it('should set .dropdownList', function () {
+      expect(this.commentTypeToggle.dropdownList).toBe(this.dropdownList);
     });
 
-    it('should set .input', function () {
-      expect(this.commentTypeToggle.input).toBe(this.input);
+    it('should set .noteTypeInput', function () {
+      expect(this.commentTypeToggle.noteTypeInput).toBe(this.noteTypeInput);
     });
 
-    it('should set .button', function () {
-      expect(this.commentTypeToggle.button).toBe(this.button);
+    it('should set .submitButton', function () {
+      expect(this.commentTypeToggle.submitButton).toBe(this.submitButton);
+    });
+
+    it('should set .closeButton', function () {
+      expect(this.commentTypeToggle.closeButton).toBe(this.closeButton);
     });
   });
 
   describe('initDroplab', function () {
     beforeEach(function () {
       this.commentTypeToggle = {
-        trigger: {},
-        list: {},
-        input: {},
-        button: {},
+        dropdownTrigger: {},
+        dropdownList: {},
+        noteTypeInput: {},
+        submitButton: {},
+        closeButton: {},
       };
 
-      this.droplab = jasmine.createSpyObj('droplab', ['addHook']);
+      this.droplab = jasmine.createSpyObj('droplab', ['init']);
 
-      spyOn(window, 'DropLab').and.returnValue(this.droplab);
+      spyOn(dropLabSrc, 'default').and.returnValue(this.droplab);
 
       this.initDroplab = CommentTypeToggle.prototype.initDroplab.call(this.commentTypeToggle);
     });
 
     it('should instantiate a DropLab instance', function () {
-      expect(window.DropLab).toHaveBeenCalled();
+      expect(dropLabSrc.default).toHaveBeenCalled();
     });
 
     it('should set .droplab', function () {
       expect(this.commentTypeToggle.droplab).toBe(this.droplab);
     });
 
-    it('should call DropLab.prototype.addHook', function () {
-      expect(this.droplab.addHook).toHaveBeenCalledWith(
-        this.commentTypeToggle.trigger,
-        this.commentTypeToggle.list,
+    it('should call DropLab.prototype.init', function () {
+      expect(this.droplab.init).toHaveBeenCalledWith(
+        this.commentTypeToggle.dropdownTrigger,
+        this.commentTypeToggle.dropdownList,
         [InputSetter],
         {
           InputSetter: [{
-            input: this.commentTypeToggle.input,
+            input: this.commentTypeToggle.noteTypeInput,
             valueAttribute: 'data-value',
           }, {
-            input: this.commentTypeToggle.button,
+            input: this.commentTypeToggle.submitButton,
             valueAttribute: 'data-button-text',
+          },
+          {
+            input: this.commentTypeToggle.closeButton,
+            valueAttribute: 'data-secondary-button-text',
+          }, {
+            input: this.commentTypeToggle.closeButton,
+            valueAttribute: 'data-secondary-button-text',
+            inputAttribute: 'data-alternative-text',
           }],
         },
       );
     });
+
+    describe('if no .closeButton is provided', function () {
+      beforeEach(function () {
+        this.commentTypeToggle = {
+          dropdownTrigger: {},
+          dropdownList: {},
+          noteTypeInput: {},
+          submitButton: {},
+        };
+
+        this.initDroplab = CommentTypeToggle.prototype.initDroplab.call(this.commentTypeToggle);
+      });
+
+      it('should not add .closeButton related InputSetter config', function () {
+        expect(this.droplab.init).toHaveBeenCalledWith(
+          this.commentTypeToggle.dropdownTrigger,
+          this.commentTypeToggle.dropdownList,
+          [InputSetter],
+          {
+            InputSetter: [{
+              input: this.commentTypeToggle.noteTypeInput,
+              valueAttribute: 'data-value',
+            }, {
+              input: this.commentTypeToggle.submitButton,
+              valueAttribute: 'data-button-text',
+            }],
+          },
+        );
+      });
+    });
   });
 });