Merge branch 'improve-require-input-spec' into 'master'

Improve require input spec

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

1 files changed, 40 insertions, 36 deletions

diff --git a/spec/javascripts/behaviors/requires_input_spec.js b/spec/javascripts/behaviors/requires_input_spec.js
index f9fa814b801..8287c58ac5a 100644
--- a/spec/javascripts/behaviors/requires_input_spec.js
+++ b/spec/javascripts/behaviors/requires_input_spec.js
@@ -1,39 +1,43 @@
-/* eslint-disable space-before-function-paren, no-var */
-
 import '~/behaviors/requires_input';
 
-(function() {
-  describe('requiresInput', function() {
-    preloadFixtures('branches/new_branch.html.raw');
-    beforeEach(function() {
-      loadFixtures('branches/new_branch.html.raw');
-      this.submitButton = $('button[type="submit"]');
-    });
-    it('disables submit when any field is required', function() {
-      $('.js-requires-input').requiresInput();
-      return expect(this.submitButton).toBeDisabled();
-    });
-    it('enables submit when no field is required', function() {
-      $('*[required=required]').removeAttr('required');
-      $('.js-requires-input').requiresInput();
-      return expect(this.submitButton).not.toBeDisabled();
-    });
-    it('enables submit when all required fields are pre-filled', function() {
-      $('*[required=required]').remove();
-      $('.js-requires-input').requiresInput();
-      return expect($('.submit')).not.toBeDisabled();
-    });
-    it('enables submit when all required fields receive input', function() {
-      $('.js-requires-input').requiresInput();
-      $('#required1').val('input1').change();
-      expect(this.submitButton).toBeDisabled();
-      $('#optional1').val('input1').change();
-      expect(this.submitButton).toBeDisabled();
-      $('#required2').val('input2').change();
-      $('#required3').val('input3').change();
-      $('#required4').val('input4').change();
-      $('#required5').val('1').change();
-      return expect($('.submit')).not.toBeDisabled();
-    });
+describe('requiresInput', () => {
+  let submitButton;
+  preloadFixtures('branches/new_branch.html.raw');
+
+  beforeEach(() => {
+    loadFixtures('branches/new_branch.html.raw');
+    submitButton = $('button[type="submit"]');
+  });
+
+  it('disables submit when any field is required', () => {
+    $('.js-requires-input').requiresInput();
+    expect(submitButton).toBeDisabled();
+  });
+
+  it('enables submit when no field is required', () => {
+    $('*[required=required]').removeAttr('required');
+    $('.js-requires-input').requiresInput();
+    expect(submitButton).not.toBeDisabled();
+  });
+
+  it('enables submit when all required fields are pre-filled', () => {
+    $('*[required=required]').remove();
+    $('.js-requires-input').requiresInput();
+    expect($('.submit')).not.toBeDisabled();
+  });
+
+  it('enables submit when all required fields receive input', () => {
+    $('.js-requires-input').requiresInput();
+    $('#required1').val('input1').change();
+    expect(submitButton).toBeDisabled();
+
+    $('#optional1').val('input1').change();
+    expect(submitButton).toBeDisabled();
+
+    $('#required2').val('input2').change();
+    $('#required3').val('input3').change();
+    $('#required4').val('input4').change();
+    $('#required5').val('1').change();
+    expect($('.submit')).not.toBeDisabled();
   });
-}).call(window);
+});