enable jasmine/new-line-before-expect

1 files changed, 39 insertions, 0 deletions

diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js b/spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js
index 81c16593eb4..b795ce680ce 100644
--- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js
+++ b/spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js
@@ -76,11 +76,13 @@ describe('ReadyToMerge', () => {
     describe('shouldShowMergeWhenPipelineSucceedsText', () => {
       it('should return true with active pipeline', () => {
         vm.mr.isPipelineActive = true;
+
         expect(vm.shouldShowMergeWhenPipelineSucceedsText).toBeTruthy();
       });
 
       it('should return false with inactive pipeline', () => {
         vm.mr.isPipelineActive = false;
+
         expect(vm.shouldShowMergeWhenPipelineSucceedsText).toBeFalsy();
       });
     });
@@ -95,6 +97,7 @@ describe('ReadyToMerge', () => {
 
       it('should return message without description', () => {
         vm.useCommitMessageWithDescription = true;
+
         expect(vm.commitMessageLinkTitle).toEqual(withoutDesc);
       });
     });
@@ -102,11 +105,13 @@ describe('ReadyToMerge', () => {
     describe('status', () => {
       it('defaults to success', () => {
         vm.mr.pipeline = true;
+
         expect(vm.status).toEqual('success');
       });
 
       it('returns failed when MR has CI but also has an unknown status', () => {
         vm.mr.hasCI = true;
+
         expect(vm.status).toEqual('failed');
       });
 
@@ -117,12 +122,14 @@ describe('ReadyToMerge', () => {
       it('returns pending when pipeline is active', () => {
         vm.mr.pipeline = {};
         vm.mr.isPipelineActive = true;
+
         expect(vm.status).toEqual('pending');
       });
 
       it('returns failed when pipeline is failed', () => {
         vm.mr.pipeline = {};
         vm.mr.isPipelineFailed = true;
+
         expect(vm.status).toEqual('failed');
       });
     });
@@ -138,17 +145,20 @@ describe('ReadyToMerge', () => {
 
       it('returns success class for success status', () => {
         vm.mr.pipeline = true;
+
         expect(vm.mergeButtonClass).toEqual(defaultClass);
       });
 
       it('returns info class for pending status', () => {
         vm.mr.pipeline = {};
         vm.mr.isPipelineActive = true;
+
         expect(vm.mergeButtonClass).toEqual(inActionClass);
       });
 
       it('returns failed class for failed status', () => {
         vm.mr.hasCI = true;
+
         expect(vm.mergeButtonClass).toEqual(failedClass);
       });
     });
@@ -160,22 +170,26 @@ describe('ReadyToMerge', () => {
 
       it('shows tick for success status', () => {
         vm.mr.pipeline = true;
+
         expect(vm.iconClass).toEqual('success');
       });
 
       it('shows tick for pending status', () => {
         vm.mr.pipeline = {};
         vm.mr.isPipelineActive = true;
+
         expect(vm.iconClass).toEqual('success');
       });
 
       it('shows warning icon for failed status', () => {
         vm.mr.hasCI = true;
+
         expect(vm.iconClass).toEqual('warning');
       });
 
       it('shows warning icon for merge not allowed', () => {
         vm.mr.hasCI = true;
+
         expect(vm.iconClass).toEqual('warning');
       });
     });
@@ -187,12 +201,14 @@ describe('ReadyToMerge', () => {
 
       it('should return Merge in progress', () => {
         vm.isMergingImmediately = true;
+
         expect(vm.mergeButtonText).toEqual('Merge in progress');
       });
 
       it('should return Merge when pipeline succeeds', () => {
         vm.isMergingImmediately = false;
         vm.mr.isPipelineActive = true;
+
         expect(vm.mergeButtonText).toEqual('Merge when pipeline succeeds');
       });
     });
@@ -204,12 +220,14 @@ describe('ReadyToMerge', () => {
 
       it('should return true when pipeline active', () => {
         vm.mr.isPipelineActive = true;
+
         expect(vm.shouldShowMergeOptionsDropdown).toBeTruthy();
       });
 
       it('should return false when pipeline active but only merge when pipeline succeeds set in project options', () => {
         vm.mr.isPipelineActive = true;
         vm.mr.onlyAllowMergeIfPipelineSucceeds = true;
+
         expect(vm.shouldShowMergeOptionsDropdown).toBeFalsy();
       });
     });
@@ -217,24 +235,28 @@ describe('ReadyToMerge', () => {
     describe('isMergeButtonDisabled', () => {
       it('should return false with initial data', () => {
         vm.mr.isMergeAllowed = true;
+
         expect(vm.isMergeButtonDisabled).toBeFalsy();
       });
 
       it('should return true when there is no commit message', () => {
         vm.mr.isMergeAllowed = true;
         vm.commitMessage = '';
+
         expect(vm.isMergeButtonDisabled).toBeTruthy();
       });
 
       it('should return true if merge is not allowed', () => {
         vm.mr.isMergeAllowed = false;
         vm.mr.onlyAllowMergeIfPipelineSucceeds = true;
+
         expect(vm.isMergeButtonDisabled).toBeTruthy();
       });
 
       it('should return true when the vm instance is making request', () => {
         vm.mr.isMergeAllowed = true;
         vm.isMakingRequest = true;
+
         expect(vm.isMergeButtonDisabled).toBeTruthy();
       });
     });
@@ -245,24 +267,28 @@ describe('ReadyToMerge', () => {
       it('should return false when an external pipeline is running and required to succeed', () => {
         vm.mr.isMergeAllowed = false;
         vm.mr.isPipelineActive = false;
+
         expect(vm.shouldShowMergeControls()).toBeFalsy();
       });
 
       it('should return true when the build succeeded or build not required to succeed', () => {
         vm.mr.isMergeAllowed = true;
         vm.mr.isPipelineActive = false;
+
         expect(vm.shouldShowMergeControls()).toBeTruthy();
       });
 
       it('should return true when showing the MWPS button and a pipeline is running that needs to be successful', () => {
         vm.mr.isMergeAllowed = false;
         vm.mr.isPipelineActive = true;
+
         expect(vm.shouldShowMergeControls()).toBeTruthy();
       });
 
       it('should return true when showing the MWPS button but not required for the pipeline to succeed', () => {
         vm.mr.isMergeAllowed = true;
         vm.mr.isPipelineActive = true;
+
         expect(vm.shouldShowMergeControls()).toBeTruthy();
       });
     });
@@ -272,9 +298,11 @@ describe('ReadyToMerge', () => {
         expect(vm.useCommitMessageWithDescription).toBeFalsy();
         expect(vm.commitMessage).toEqual(commitMessage);
         vm.updateCommitMessage();
+
         expect(vm.useCommitMessageWithDescription).toBeTruthy();
         expect(vm.commitMessage).toEqual(commitMessageWithDescription);
         vm.updateCommitMessage();
+
         expect(vm.useCommitMessageWithDescription).toBeFalsy();
         expect(vm.commitMessage).toEqual(commitMessage);
       });
@@ -284,6 +312,7 @@ describe('ReadyToMerge', () => {
       it('should toggle showCommitMessageEditor flag', () => {
         expect(vm.showCommitMessageEditor).toBeFalsy();
         vm.toggleCommitMessageEditor();
+
         expect(vm.showCommitMessageEditor).toBeTruthy();
       });
     });
@@ -309,6 +338,7 @@ describe('ReadyToMerge', () => {
           expect(eventHub.$emit).toHaveBeenCalledWith('MRWidgetUpdateRequested');
 
           const params = vm.service.merge.calls.argsFor(0)[0];
+
           expect(params.sha).toEqual(vm.mr.sha);
           expect(params.commit_message).toEqual(vm.mr.commitMessage);
           expect(params.should_remove_source_branch).toBeFalsy();
@@ -328,6 +358,7 @@ describe('ReadyToMerge', () => {
           expect(eventHub.$emit).toHaveBeenCalledWith('FailedToMerge', undefined);
 
           const params = vm.service.merge.calls.argsFor(0)[0];
+
           expect(params.should_remove_source_branch).toBeTruthy();
           expect(params.merge_when_pipeline_succeeds).toBeFalsy();
           done();
@@ -345,6 +376,7 @@ describe('ReadyToMerge', () => {
           expect(vm.initiateMergePolling).toHaveBeenCalled();
 
           const params = vm.service.merge.calls.argsFor(0)[0];
+
           expect(params.should_remove_source_branch).toBeTruthy();
           expect(params.merge_when_pipeline_succeeds).toBeFalsy();
           done();
@@ -356,6 +388,7 @@ describe('ReadyToMerge', () => {
       it('should call simplePoll', () => {
         const simplePoll = spyOnDependency(ReadyToMerge, 'simplePoll');
         vm.initiateMergePolling();
+
         expect(simplePoll).toHaveBeenCalled();
       });
     });
@@ -403,6 +436,7 @@ describe('ReadyToMerge', () => {
 
         setTimeout(() => {
           const statusBox = document.querySelector('.status-box');
+
           expect(statusBox.classList.contains('status-box-mr-merged')).toBeTruthy();
           expect(statusBox.textContent).toContain('Merged');
 
@@ -459,6 +493,7 @@ describe('ReadyToMerge', () => {
         const simplePoll = spyOnDependency(ReadyToMerge, 'simplePoll');
 
         vm.initiateRemoveSourceBranchPolling();
+
         expect(eventHub.$emit).toHaveBeenCalledWith('SetBranchRemoveFlag', [true]);
         expect(simplePoll).toHaveBeenCalled();
       });
@@ -485,9 +520,11 @@ describe('ReadyToMerge', () => {
           expect(vm.service.poll).toHaveBeenCalled();
 
           const args = eventHub.$emit.calls.argsFor(0);
+
           expect(args[0]).toEqual('MRWidgetUpdateRequested');
           expect(args[1]).toBeDefined();
           args[1]();
+
           expect(eventHub.$emit).toHaveBeenCalledWith('SetBranchRemoveFlag', [false]);
 
           expect(cpc).toBeFalsy();
@@ -518,6 +555,7 @@ describe('ReadyToMerge', () => {
     describe('when user can merge but cannot delete branch', () => {
       it('should be disabled in the rendered output', () => {
         const checkboxElement = vm.$el.querySelector('#remove-source-branch-input');
+
         expect(checkboxElement).toBeNull();
       });
     });
@@ -537,6 +575,7 @@ describe('ReadyToMerge', () => {
 
       it('should be enabled in rendered output', () => {
         const checkboxElement = customVm.$el.querySelector('#remove-source-branch-input');
+
         expect(checkboxElement).not.toBeNull();
       });
     });