Merge branch '38869-u2f' into 'master'38968-label-picker-should-be-cleared-upon-selecting-a-label

Remove u2f from global namespace

See merge request gitlab-org/gitlab-ce!14776

3 files changed, 131 insertions, 151 deletions

diff --git a/spec/javascripts/u2f/authenticate_spec.js b/spec/javascripts/u2f/authenticate_spec.js
index a160c86308d..29b15f3a782 100644
--- a/spec/javascripts/u2f/authenticate_spec.js
+++ b/spec/javascripts/u2f/authenticate_spec.js
@@ -1,72 +1,63 @@
-/* eslint-disable space-before-function-paren, new-parens, quotes, comma-dangle, no-var, one-var, one-var-declaration-per-line, max-len */
-/* global MockU2FDevice */
-/* global U2FAuthenticate */
-
-import '~/u2f/authenticate';
-import '~/u2f/util';
-import '~/u2f/error';
+import U2FAuthenticate from '~/u2f/authenticate';
 import 'vendor/u2f';
-import './mock_u2f_device';
+import MockU2FDevice from './mock_u2f_device';
+
+describe('U2FAuthenticate', () => {
+  preloadFixtures('u2f/authenticate.html.raw');
 
-(function() {
-  describe('U2FAuthenticate', function() {
-    preloadFixtures('u2f/authenticate.html.raw');
+  beforeEach(() => {
+    loadFixtures('u2f/authenticate.html.raw');
+    this.u2fDevice = new MockU2FDevice();
+    this.container = $('#js-authenticate-u2f');
+    this.component = new U2FAuthenticate(
+      this.container,
+      '#js-login-u2f-form',
+      {
+        sign_requests: [],
+      },
+      document.querySelector('#js-login-2fa-device'),
+      document.querySelector('.js-2fa-form'),
+    );
 
-    beforeEach(function() {
-      loadFixtures('u2f/authenticate.html.raw');
-      this.u2fDevice = new MockU2FDevice;
-      this.container = $("#js-authenticate-u2f");
-      this.component = new window.gl.U2FAuthenticate(
-        this.container,
-        '#js-login-u2f-form',
-        {
-          sign_requests: []
-        },
-        document.querySelector('#js-login-2fa-device'),
-        document.querySelector('.js-2fa-form')
-      );
+    // bypass automatic form submission within renderAuthenticated
+    spyOn(this.component, 'renderAuthenticated').and.returnValue(true);
 
-      // bypass automatic form submission within renderAuthenticated
-      spyOn(this.component, 'renderAuthenticated').and.returnValue(true);
+    return this.component.start();
+  });
 
-      return this.component.start();
+  it('allows authenticating via a U2F device', () => {
+    const inProgressMessage = this.container.find('p');
+    expect(inProgressMessage.text()).toContain('Trying to communicate with your device');
+    this.u2fDevice.respondToAuthenticateRequest({
+      deviceData: 'this is data from the device',
     });
-    it('allows authenticating via a U2F device', function() {
-      var inProgressMessage;
-      inProgressMessage = this.container.find("p");
-      expect(inProgressMessage.text()).toContain("Trying to communicate with your device");
+    expect(this.component.renderAuthenticated).toHaveBeenCalledWith('{"deviceData":"this is data from the device"}');
+  });
+
+  return describe('errors', () => {
+    it('displays an error message', () => {
+      const setupButton = this.container.find('#js-login-u2f-device');
+      setupButton.trigger('click');
       this.u2fDevice.respondToAuthenticateRequest({
-        deviceData: "this is data from the device"
+        errorCode: 'error!',
       });
-      expect(this.component.renderAuthenticated).toHaveBeenCalledWith('{"deviceData":"this is data from the device"}');
+      const errorMessage = this.container.find('p');
+      return expect(errorMessage.text()).toContain('There was a problem communicating with your device');
     });
-    return describe("errors", function() {
-      it("displays an error message", function() {
-        var errorMessage, setupButton;
-        setupButton = this.container.find("#js-login-u2f-device");
-        setupButton.trigger('click');
-        this.u2fDevice.respondToAuthenticateRequest({
-          errorCode: "error!"
-        });
-        errorMessage = this.container.find("p");
-        return expect(errorMessage.text()).toContain("There was a problem communicating with your device");
+    return it('allows retrying authentication after an error', () => {
+      let setupButton = this.container.find('#js-login-u2f-device');
+      setupButton.trigger('click');
+      this.u2fDevice.respondToAuthenticateRequest({
+        errorCode: 'error!',
       });
-      return it("allows retrying authentication after an error", function() {
-        var retryButton, setupButton;
-        setupButton = this.container.find("#js-login-u2f-device");
-        setupButton.trigger('click');
-        this.u2fDevice.respondToAuthenticateRequest({
-          errorCode: "error!"
-        });
-        retryButton = this.container.find("#js-u2f-try-again");
-        retryButton.trigger('click');
-        setupButton = this.container.find("#js-login-u2f-device");
-        setupButton.trigger('click');
-        this.u2fDevice.respondToAuthenticateRequest({
-          deviceData: "this is data from the device"
-        });
-        expect(this.component.renderAuthenticated).toHaveBeenCalledWith('{"deviceData":"this is data from the device"}');
+      const retryButton = this.container.find('#js-u2f-try-again');
+      retryButton.trigger('click');
+      setupButton = this.container.find('#js-login-u2f-device');
+      setupButton.trigger('click');
+      this.u2fDevice.respondToAuthenticateRequest({
+        deviceData: 'this is data from the device',
       });
+      expect(this.component.renderAuthenticated).toHaveBeenCalledWith('{"deviceData":"this is data from the device"}');
     });
   });
-}).call(window);
+});
diff --git a/spec/javascripts/u2f/mock_u2f_device.js b/spec/javascripts/u2f/mock_u2f_device.js
index 4eb8ad3d9e4..5a1ace2b4d6 100644
--- a/spec/javascripts/u2f/mock_u2f_device.js
+++ b/spec/javascripts/u2f/mock_u2f_device.js
@@ -1,31 +1,28 @@
-/* eslint-disable space-before-function-paren, no-var, prefer-rest-params, wrap-iife, no-unused-expressions, no-return-assign, no-param-reassign, max-len */
+/* eslint-disable prefer-rest-params, wrap-iife,
+no-unused-expressions, no-return-assign, no-param-reassign*/
 
-(function() {
-  this.MockU2FDevice = (function() {
-    function MockU2FDevice() {
-      this.respondToAuthenticateRequest = this.respondToAuthenticateRequest.bind(this);
-      this.respondToRegisterRequest = this.respondToRegisterRequest.bind(this);
-      window.u2f || (window.u2f = {});
-      window.u2f.register = (function(_this) {
-        return function(appId, registerRequests, signRequests, callback) {
-          return _this.registerCallback = callback;
-        };
-      })(this);
-      window.u2f.sign = (function(_this) {
-        return function(appId, challenges, signRequests, callback) {
-          return _this.authenticateCallback = callback;
-        };
-      })(this);
-    }
+export default class MockU2FDevice {
+  constructor() {
+    this.respondToAuthenticateRequest = this.respondToAuthenticateRequest.bind(this);
+    this.respondToRegisterRequest = this.respondToRegisterRequest.bind(this);
+    window.u2f || (window.u2f = {});
+    window.u2f.register = (function (_this) {
+      return function (appId, registerRequests, signRequests, callback) {
+        return _this.registerCallback = callback;
+      };
+    })(this);
+    window.u2f.sign = (function (_this) {
+      return function (appId, challenges, signRequests, callback) {
+        return _this.authenticateCallback = callback;
+      };
+    })(this);
+  }
 
-    MockU2FDevice.prototype.respondToRegisterRequest = function(params) {
-      return this.registerCallback(params);
-    };
+  respondToRegisterRequest(params) {
+    return this.registerCallback(params);
+  }
 
-    MockU2FDevice.prototype.respondToAuthenticateRequest = function(params) {
-      return this.authenticateCallback(params);
-    };
-
-    return MockU2FDevice;
-  })();
-}).call(window);
+  respondToAuthenticateRequest(params) {
+    return this.authenticateCallback(params);
+  }
+}
diff --git a/spec/javascripts/u2f/register_spec.js b/spec/javascripts/u2f/register_spec.js
index a445c80f2af..b0051f11362 100644
--- a/spec/javascripts/u2f/register_spec.js
+++ b/spec/javascripts/u2f/register_spec.js
@@ -1,77 +1,69 @@
-/* eslint-disable space-before-function-paren, new-parens, quotes, no-var, one-var, one-var-declaration-per-line, comma-dangle, max-len */
-/* global MockU2FDevice */
-/* global U2FRegister */
-
-import '~/u2f/register';
-import '~/u2f/util';
-import '~/u2f/error';
+import U2FRegister from '~/u2f/register';
 import 'vendor/u2f';
-import './mock_u2f_device';
+import MockU2FDevice from './mock_u2f_device';
+
+describe('U2FRegister', () => {
+  preloadFixtures('u2f/register.html.raw');
 
-(function() {
-  describe('U2FRegister', function() {
-    preloadFixtures('u2f/register.html.raw');
+  beforeEach(() => {
+    loadFixtures('u2f/register.html.raw');
+    this.u2fDevice = new MockU2FDevice();
+    this.container = $('#js-register-u2f');
+    this.component = new U2FRegister(this.container, $('#js-register-u2f-templates'), {}, 'token');
+    return this.component.start();
+  });
 
-    beforeEach(function() {
-      loadFixtures('u2f/register.html.raw');
-      this.u2fDevice = new MockU2FDevice;
-      this.container = $("#js-register-u2f");
-      this.component = new U2FRegister(this.container, $("#js-register-u2f-templates"), {}, "token");
-      return this.component.start();
+  it('allows registering a U2F device', () => {
+    const setupButton = this.container.find('#js-setup-u2f-device');
+    expect(setupButton.text()).toBe('Setup new U2F device');
+    setupButton.trigger('click');
+    const inProgressMessage = this.container.children('p');
+    expect(inProgressMessage.text()).toContain('Trying to communicate with your device');
+    this.u2fDevice.respondToRegisterRequest({
+      deviceData: 'this is data from the device',
     });
-    it('allows registering a U2F device', function() {
-      var deviceResponse, inProgressMessage, registeredMessage, setupButton;
-      setupButton = this.container.find("#js-setup-u2f-device");
-      expect(setupButton.text()).toBe('Setup new U2F device');
+    const registeredMessage = this.container.find('p');
+    const deviceResponse = this.container.find('#js-device-response');
+    expect(registeredMessage.text()).toContain('Your device was successfully set up!');
+    return expect(deviceResponse.val()).toBe('{"deviceData":"this is data from the device"}');
+  });
+
+  return describe('errors', () => {
+    it('doesn\'t allow the same device to be registered twice (for the same user', () => {
+      const setupButton = this.container.find('#js-setup-u2f-device');
       setupButton.trigger('click');
-      inProgressMessage = this.container.children("p");
-      expect(inProgressMessage.text()).toContain("Trying to communicate with your device");
       this.u2fDevice.respondToRegisterRequest({
-        deviceData: "this is data from the device"
+        errorCode: 4,
       });
-      registeredMessage = this.container.find('p');
-      deviceResponse = this.container.find('#js-device-response');
-      expect(registeredMessage.text()).toContain("Your device was successfully set up!");
-      return expect(deviceResponse.val()).toBe('{"deviceData":"this is data from the device"}');
+      const errorMessage = this.container.find('p');
+      return expect(errorMessage.text()).toContain('already been registered with us');
     });
-    return describe("errors", function() {
-      it("doesn't allow the same device to be registered twice (for the same user", function() {
-        var errorMessage, setupButton;
-        setupButton = this.container.find("#js-setup-u2f-device");
-        setupButton.trigger('click');
-        this.u2fDevice.respondToRegisterRequest({
-          errorCode: 4
-        });
-        errorMessage = this.container.find("p");
-        return expect(errorMessage.text()).toContain("already been registered with us");
+
+    it('displays an error message for other errors', () => {
+      const setupButton = this.container.find('#js-setup-u2f-device');
+      setupButton.trigger('click');
+      this.u2fDevice.respondToRegisterRequest({
+        errorCode: 'error!',
       });
-      it("displays an error message for other errors", function() {
-        var errorMessage, setupButton;
-        setupButton = this.container.find("#js-setup-u2f-device");
-        setupButton.trigger('click');
-        this.u2fDevice.respondToRegisterRequest({
-          errorCode: "error!"
-        });
-        errorMessage = this.container.find("p");
-        return expect(errorMessage.text()).toContain("There was a problem communicating with your device");
+      const errorMessage = this.container.find('p');
+      return expect(errorMessage.text()).toContain('There was a problem communicating with your device');
+    });
+
+    return it('allows retrying registration after an error', () => {
+      let setupButton = this.container.find('#js-setup-u2f-device');
+      setupButton.trigger('click');
+      this.u2fDevice.respondToRegisterRequest({
+        errorCode: 'error!',
       });
-      return it("allows retrying registration after an error", function() {
-        var registeredMessage, retryButton, setupButton;
-        setupButton = this.container.find("#js-setup-u2f-device");
-        setupButton.trigger('click');
-        this.u2fDevice.respondToRegisterRequest({
-          errorCode: "error!"
-        });
-        retryButton = this.container.find("#U2FTryAgain");
-        retryButton.trigger('click');
-        setupButton = this.container.find("#js-setup-u2f-device");
-        setupButton.trigger('click');
-        this.u2fDevice.respondToRegisterRequest({
-          deviceData: "this is data from the device"
-        });
-        registeredMessage = this.container.find("p");
-        return expect(registeredMessage.text()).toContain("Your device was successfully set up!");
+      const retryButton = this.container.find('#U2FTryAgain');
+      retryButton.trigger('click');
+      setupButton = this.container.find('#js-setup-u2f-device');
+      setupButton.trigger('click');
+      this.u2fDevice.respondToRegisterRequest({
+        deviceData: 'this is data from the device',
       });
+      const registeredMessage = this.container.find('p');
+      return expect(registeredMessage.text()).toContain('Your device was successfully set up!');
     });
   });
-}).call(window);
+});