Use template strings in search_autocomplete_spec.js

spec/javascripts/search_autocomplete_spec.js

@@ -6,8 +6,21 @@ import SearchAutocomplete from '~/search_autocomplete';
 import '~/lib/utils/common_utils';
 import * as urlUtils from '~/lib/utils/url_utility';
 
-(function() {
+describe('Search autocomplete dropdown', () => {
-  var assertLinks, dashboardIssuesPath, dashboardMRsPath, groupIssuesPath, groupMRsPath, groupName, mockDashboardOptions, mockGroupOptions, mockProjectOptions, projectIssuesPath, projectMRsPath, projectName, userId, widget;
+  var assertLinks,
+    dashboardIssuesPath,
+    dashboardMRsPath,
+    groupIssuesPath,
+    groupMRsPath,
+    groupName,
+    mockDashboardOptions,
+    mockGroupOptions,
+    mockProjectOptions,
+    projectIssuesPath,
+    projectMRsPath,
+    projectName,
+    userId,
+    widget;
   var userName = 'root';
 
   widget = null;
@@ -66,58 +79,52 @@ import * as urlUtils from '~/lib/utils/url_utility';
   // Mock `gl` object in window for dashboard specific page. App code will need it.
   mockDashboardOptions = function() {
     window.gl || (window.gl = {});
-    return window.gl.dashboardOptions = {
+    return (window.gl.dashboardOptions = {
       issuesPath: dashboardIssuesPath,
-      mrPath: dashboardMRsPath
+      mrPath: dashboardMRsPath,
-    };
+    });
   };
 
   // Mock `gl` object in window for project specific page. App code will need it.
   mockProjectOptions = function() {
     window.gl || (window.gl = {});
-    return window.gl.projectOptions = {
+    return (window.gl.projectOptions = {
       'gitlab-ce': {
         issuesPath: projectIssuesPath,
         mrPath: projectMRsPath,
-        projectName: projectName
+        projectName: projectName,
-      }
+      },
-    };
+    });
   };
 
   mockGroupOptions = function() {
     window.gl || (window.gl = {});
-    return window.gl.groupOptions = {
+    return (window.gl.groupOptions = {
       'gitlab-org': {
         issuesPath: groupIssuesPath,
         mrPath: groupMRsPath,
-        projectName: groupName
+        projectName: groupName,
-      }
+      },
-    };
+    });
   };
 
   assertLinks = function(list, issuesPath, mrsPath) {
-    var a1, a2, a3, a4, issuesAssignedToMeLink, issuesIHaveCreatedLink, mrsAssignedToMeLink, mrsIHaveCreatedLink;
     if (issuesPath) {
-      issuesAssignedToMeLink = issuesPath + "/?assignee_id=" + userId;
+      const issuesAssignedToMeLink = `a[href="${issuesPath}/?assignee_id=${userId}"]`;
-      issuesIHaveCreatedLink = issuesPath + "/?author_id=" + userId;
+      const issuesIHaveCreatedLink = `a[href="${issuesPath}/?author_id=${userId}"]`;
-      a1 = "a[href='" + issuesAssignedToMeLink + "']";
+      expect(list.find(issuesAssignedToMeLink).length).toBe(1);
-      a2 = "a[href='" + issuesIHaveCreatedLink + "']";
+      expect(list.find(issuesAssignedToMeLink).text()).toBe('Issues assigned to me');
-      expect(list.find(a1).length).toBe(1);
+      expect(list.find(issuesIHaveCreatedLink).length).toBe(1);
-      expect(list.find(a1).text()).toBe('Issues assigned to me');
+      expect(list.find(issuesIHaveCreatedLink).text()).toBe("Issues I've created");
-      expect(list.find(a2).length).toBe(1);
-      expect(list.find(a2).text()).toBe("Issues I've created");
     }
-    mrsAssignedToMeLink = mrsPath + "/?assignee_id=" + userId;
+    const mrsAssignedToMeLink = `a[href="${mrsPath}/?assignee_id=${userId}"]`;
-    mrsIHaveCreatedLink = mrsPath + "/?author_id=" + userId;
+    const mrsIHaveCreatedLink = `a[href="${mrsPath}/?author_id=${userId}"]`;
-    a3 = "a[href='" + mrsAssignedToMeLink + "']";
+    expect(list.find(mrsAssignedToMeLink).length).toBe(1);
-    a4 = "a[href='" + mrsIHaveCreatedLink + "']";
+    expect(list.find(mrsAssignedToMeLink).text()).toBe('Merge requests assigned to me');
-    expect(list.find(a3).length).toBe(1);
+    expect(list.find(mrsIHaveCreatedLink).length).toBe(1);
-    expect(list.find(a3).text()).toBe('Merge requests assigned to me');
+    expect(list.find(mrsIHaveCreatedLink).text()).toBe("Merge requests I've created");
-    expect(list.find(a4).length).toBe(1);
-    return expect(list.find(a4).text()).toBe("Merge requests I've created");
   };
 
-  describe('Search autocomplete dropdown', function() {
   preloadFixtures('static/search_autocomplete.html.raw');
   beforeEach(function() {
     loadFixtures('static/search_autocomplete.html.raw');
@@ -129,7 +136,7 @@ import * as urlUtils from '~/lib/utils/url_utility';
     window.gon.current_user_id = userId;
     window.gon.current_username = userName;
 
-      return widget = new SearchAutocomplete();
+    return (widget = new SearchAutocomplete());
   });
 
   afterEach(function() {
@@ -176,10 +183,10 @@ import * as urlUtils from '~/lib/utils/url_utility';
     widget.searchInput.val('help');
     widget.searchInput.triggerHandler('focus');
     list = widget.wrap.find('.dropdown-menu').find('ul');
-      link = "a[href='" + projectIssuesPath + "/?assignee_id=" + userId + "']";
+    link = "a[href='" + projectIssuesPath + '/?assignee_id=' + userId + "']";
     return expect(list.find(link).length).toBe(0);
   });
-    return it('should not submit the search form when selecting an autocomplete row with the keyboard', function() {
+  it('should not submit the search form when selecting an autocomplete row with the keyboard', function() {
     var ENTER = 13;
     var DOWN = 40;
     addBodyAttributes();
@@ -194,5 +201,4 @@ import * as urlUtils from '~/lib/utils/url_utility';
     // example) on JavaScript-created keypresses.
     expect(submitSpy).not.toHaveBeenTriggered();
   });
-  });
+});
-}).call(window);