Remove inclusive JS imports30281-report-abusive-content-from-an-issue-or-merge-request

6 files changed, 20 insertions, 34 deletions

diff --git a/app/assets/javascripts/close_reopen_report_toggle.js b/app/assets/javascripts/close_reopen_report_toggle.js
index 0824f124984..43467a7e277 100644
--- a/app/assets/javascripts/close_reopen_report_toggle.js
+++ b/app/assets/javascripts/close_reopen_report_toggle.js
@@ -1,4 +1,4 @@
-import * as DropLab from './droplab/drop_lab';
+import DropLab from './droplab/drop_lab';
 import ISetter from './droplab/plugins/input_setter';
 
 // Todo: Remove this when fixing issue in input_setter plugin
@@ -15,7 +15,7 @@ class CloseReopenReportToggle {
     this.reopenItem = this.dropdownList.querySelector('.reopen-item');
     this.closeItem = this.dropdownList.querySelector('.close-item');
 
-    this.droplab = new DropLab.default();
+    this.droplab = new DropLab();
 
     const config = this.setConfig();
 
diff --git a/app/assets/javascripts/issue.js b/app/assets/javascripts/issue.js
index b61570e88e0..62ffde6c93c 100644
--- a/app/assets/javascripts/issue.js
+++ b/app/assets/javascripts/issue.js
@@ -6,7 +6,7 @@ import '~/lib/utils/text_utility';
 import './flash';
 import './task_list';
 import CreateMergeRequestDropdown from './create_merge_request_dropdown';
-import * as CloseReopenReportToggle from './close_reopen_report_toggle';
+import CloseReopenReportToggle from './close_reopen_report_toggle';
 
 class Issue {
   constructor() {
@@ -98,7 +98,7 @@ class Issue {
     const dropdownList = container.querySelector('.js-issuable-close-menu');
     const button = container.querySelector('.js-issuable-close-button');
 
-    this.closeReopenReportToggle = new CloseReopenReportToggle.default({
+    this.closeReopenReportToggle = new CloseReopenReportToggle({
       dropdownTrigger,
       dropdownList,
       button,
diff --git a/app/assets/javascripts/merge_request.js b/app/assets/javascripts/merge_request.js
index eebf45aa581..412d68dc37a 100644
--- a/app/assets/javascripts/merge_request.js
+++ b/app/assets/javascripts/merge_request.js
@@ -4,7 +4,7 @@
 import 'vendor/jquery.waitforimages';
 import './task_list';
 import './merge_request_tabs';
-import * as CloseReopenReportToggle from './close_reopen_report_toggle';
+import CloseReopenReportToggle from './close_reopen_report_toggle';
 
 (function() {
   this.MergeRequest = (function() {
@@ -130,7 +130,7 @@ import * as CloseReopenReportToggle from './close_reopen_report_toggle';
       const dropdownList = container.querySelector('.js-issuable-close-menu');
       const button = container.querySelector('.js-issuable-close-button');
 
-      const closeReopenReportToggle = new CloseReopenReportToggle.default({
+      const closeReopenReportToggle = new CloseReopenReportToggle({
         dropdownTrigger,
         dropdownList,
         button,
diff --git a/spec/javascripts/close_reopen_report_toggle_spec.js b/spec/javascripts/close_reopen_report_toggle_spec.js
index 9641a7e43d6..d94f6a8a345 100644
--- a/spec/javascripts/close_reopen_report_toggle_spec.js
+++ b/spec/javascripts/close_reopen_report_toggle_spec.js
@@ -1,5 +1,5 @@
 import CloseReopenReportToggle from '~/close_reopen_report_toggle';
-import * as DropLab from '~/droplab/drop_lab';
+import DropLab from '~/droplab/drop_lab';
 
 describe('CloseReopenReportToggle', () => {
   describe('class constructor', () => {
@@ -32,7 +32,6 @@ describe('CloseReopenReportToggle', () => {
   describe('initDroplab', () => {
     let closeReopenReportToggle;
     const dropdownList = jasmine.createSpyObj('dropdownList', ['querySelector']);
-    const droplab = jasmine.createSpyObj('droplab', ['init']);
     const dropdownTrigger = {};
     const button = {};
     const reopenItem = {};
@@ -40,7 +39,7 @@ describe('CloseReopenReportToggle', () => {
     const config = {};
 
     beforeEach(() => {
-      spyOn(DropLab, 'default').and.returnValue(droplab);
+      spyOn(DropLab.prototype, 'init');
       dropdownList.querySelector.and.returnValues(reopenItem, closeItem);
 
       closeReopenReportToggle = new CloseReopenReportToggle({
@@ -61,17 +60,16 @@ describe('CloseReopenReportToggle', () => {
       expect(closeReopenReportToggle.closeItem).toBe(closeItem);
     });
 
-    it('instantiates DropLab and set .droplab', () => {
-      expect(DropLab.default).toHaveBeenCalled();
-      expect(closeReopenReportToggle.droplab).toBe(droplab);
+    it('sets .droplab', () => {
+      expect(closeReopenReportToggle.droplab).toEqual(jasmine.any(Object));
     });
 
     it('calls .setConfig', () => {
       expect(closeReopenReportToggle.setConfig).toHaveBeenCalled();
     });
 
-    it('calls .droplab.init', () => {
-      expect(droplab.init).toHaveBeenCalledWith(
+    it('calls droplab.init', () => {
+      expect(DropLab.prototype.init).toHaveBeenCalledWith(
         dropdownTrigger,
         dropdownList,
         jasmine.any(Array),
diff --git a/spec/javascripts/issue_spec.js b/spec/javascripts/issue_spec.js
index 43420076be0..63241e5bbd7 100644
--- a/spec/javascripts/issue_spec.js
+++ b/spec/javascripts/issue_spec.js
@@ -1,6 +1,6 @@
 /* eslint-disable space-before-function-paren, one-var, one-var-declaration-per-line, no-use-before-define, comma-dangle, max-len */
 import Issue from '~/issue';
-import * as CloseReopenReportToggle from '~/close_reopen_report_toggle';
+import CloseReopenReportToggle from '~/close_reopen_report_toggle';
 import '~/lib/utils/text_utility';
 
 describe('Issue', function() {
@@ -208,15 +208,14 @@ describe('Issue', function() {
     });
 
     describe('initCloseReopenReport', () => {
-      it('inits a new CloseReopenReportToggle instance and calls .initDroplab', () => {
+      it('calls .initDroplab', () => {
         const container = jasmine.createSpyObj('container', ['querySelector']);
-        const closeReopenReportToggle = jasmine.createSpyObj('closeReopenReportToggle', ['initDroplab']);
         const dropdownTrigger = {};
         const dropdownList = {};
         const button = {};
 
         spyOn(document, 'querySelector').and.returnValue(container);
-        spyOn(CloseReopenReportToggle, 'default').and.returnValue(closeReopenReportToggle);
+        spyOn(CloseReopenReportToggle.prototype, 'initDroplab');
         container.querySelector.and.returnValues(dropdownTrigger, dropdownList, button);
 
         Issue.prototype.initCloseReopenReport();
@@ -225,12 +224,7 @@ describe('Issue', function() {
         expect(container.querySelector).toHaveBeenCalledWith('.js-issuable-close-toggle');
         expect(container.querySelector).toHaveBeenCalledWith('.js-issuable-close-menu');
         expect(container.querySelector).toHaveBeenCalledWith('.js-issuable-close-button');
-        expect(CloseReopenReportToggle.default).toHaveBeenCalledWith({
-          dropdownTrigger,
-          dropdownList,
-          button,
-        });
-        expect(closeReopenReportToggle.initDroplab).toHaveBeenCalled();
+        expect(CloseReopenReportToggle.prototype.initDroplab).toHaveBeenCalled();
       });
     });
   });
diff --git a/spec/javascripts/merge_request_spec.js b/spec/javascripts/merge_request_spec.js
index c8c357251cf..2c6623dde14 100644
--- a/spec/javascripts/merge_request_spec.js
+++ b/spec/javascripts/merge_request_spec.js
@@ -2,7 +2,7 @@
 /* global MergeRequest */
 
 import '~/merge_request';
-import * as CloseReopenReportToggle from '~/close_reopen_report_toggle';
+import CloseReopenReportToggle from '~/close_reopen_report_toggle';
 
 (function() {
   describe('MergeRequest', function() {
@@ -38,15 +38,14 @@ import * as CloseReopenReportToggle from '~/close_reopen_report_toggle';
     });
 
     describe('initCloseReopenReport', () => {
-      it('inits a new CloseReopenReportToggle instance and calls .initDroplab', () => {
+      it('calls .initDroplab', () => {
         const container = jasmine.createSpyObj('container', ['querySelector']);
-        const closeReopenReportToggle = jasmine.createSpyObj('closeReopenReportToggle', ['initDroplab']);
         const dropdownTrigger = {};
         const dropdownList = {};
         const button = {};
 
+        spyOn(CloseReopenReportToggle.prototype, 'initDroplab');
         spyOn(document, 'querySelector').and.returnValue(container);
-        spyOn(CloseReopenReportToggle, 'default').and.returnValue(closeReopenReportToggle);
         container.querySelector.and.returnValues(dropdownTrigger, dropdownList, button);
 
         MergeRequest.initCloseReopenReport();
@@ -55,12 +54,7 @@ import * as CloseReopenReportToggle from '~/close_reopen_report_toggle';
         expect(container.querySelector).toHaveBeenCalledWith('.js-issuable-close-toggle');
         expect(container.querySelector).toHaveBeenCalledWith('.js-issuable-close-menu');
         expect(container.querySelector).toHaveBeenCalledWith('.js-issuable-close-button');
-        expect(CloseReopenReportToggle.default).toHaveBeenCalledWith({
-          dropdownTrigger,
-          dropdownList,
-          button,
-        });
-        expect(closeReopenReportToggle.initDroplab).toHaveBeenCalled();
+        expect(CloseReopenReportToggle.prototype.initDroplab).toHaveBeenCalled();
       });
     });
   });