Merge branch 'mg-upgrade-prettier' into 'master'

Upgrade prettier to v1.15.2

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

8 files changed, 28 insertions, 19 deletions

diff --git a/spec/javascripts/lib/utils/common_utils_spec.js b/spec/javascripts/lib/utils/common_utils_spec.js
index 0fb90c3b78c..1c7691f865a 100644
--- a/spec/javascripts/lib/utils/common_utils_spec.js
+++ b/spec/javascripts/lib/utils/common_utils_spec.js
@@ -425,14 +425,16 @@ describe('common_utils', () => {
     });
 
     it('rejects the backOff promise after timing out', done => {
-      commonUtils.backOff(next => next(), 64000).catch(errBackoffResp => {
-        const timeouts = window.setTimeout.calls.allArgs().map(([, timeout]) => timeout);
+      commonUtils
+        .backOff(next => next(), 64000)
+        .catch(errBackoffResp => {
+          const timeouts = window.setTimeout.calls.allArgs().map(([, timeout]) => timeout);
 
-        expect(timeouts).toEqual([2000, 4000, 8000, 16000, 32000, 32000]);
-        expect(errBackoffResp instanceof Error).toBe(true);
-        expect(errBackoffResp.message).toBe('BACKOFF_TIMEOUT');
-        done();
-      });
+          expect(timeouts).toEqual([2000, 4000, 8000, 16000, 32000, 32000]);
+          expect(errBackoffResp instanceof Error).toBe(true);
+          expect(errBackoffResp.message).toBe('BACKOFF_TIMEOUT');
+          done();
+        });
     });
   });
 
diff --git a/spec/javascripts/performance_bar/components/detailed_metric_spec.js b/spec/javascripts/performance_bar/components/detailed_metric_spec.js
index a3b93280b4b..e91685e50c5 100644
--- a/spec/javascripts/performance_bar/components/detailed_metric_spec.js
+++ b/spec/javascripts/performance_bar/components/detailed_metric_spec.js
@@ -67,7 +67,7 @@ describe('detailedMetric', () => {
       vm.$el
         .querySelectorAll('.performance-bar-modal td:nth-child(3)')
         .forEach((request, index) => {
-          expect(request.innerText).toContain(requestDetails[index].request);
+          expect(request.innerText).toEqual(requestDetails[index].request);
         });
     });
 
diff --git a/spec/javascripts/shared/popover_spec.js b/spec/javascripts/shared/popover_spec.js
index 85bde075b77..cc2b2014d38 100644
--- a/spec/javascripts/shared/popover_spec.js
+++ b/spec/javascripts/shared/popover_spec.js
@@ -112,8 +112,8 @@ describe('popover', () => {
         length: 0,
       };
 
-      spyOn($.fn, 'init').and.callFake(
-        selector => (selector === '.popover:hover' ? fakeJquery : $.fn),
+      spyOn($.fn, 'init').and.callFake(selector =>
+        selector === '.popover:hover' ? fakeJquery : $.fn,
       );
       spyOn(togglePopover, 'call');
       mouseleave();
@@ -126,8 +126,8 @@ describe('popover', () => {
         length: 1,
       };
 
-      spyOn($.fn, 'init').and.callFake(
-        selector => (selector === '.popover:hover' ? fakeJquery : $.fn),
+      spyOn($.fn, 'init').and.callFake(selector =>
+        selector === '.popover:hover' ? fakeJquery : $.fn,
       );
       spyOn(togglePopover, 'call');
       mouseleave();
diff --git a/spec/javascripts/signin_tabs_memoizer_spec.js b/spec/javascripts/signin_tabs_memoizer_spec.js
index b688a299052..52da6a79939 100644
--- a/spec/javascripts/signin_tabs_memoizer_spec.js
+++ b/spec/javascripts/signin_tabs_memoizer_spec.js
@@ -51,8 +51,8 @@ describe('SigninTabsMemoizer', () => {
     const fakeTab = {
       click: () => {},
     };
-    spyOn(document, 'querySelector').and.callFake(
-      selector => (selector === `${tabSelector} a[href="#bogus"]` ? null : fakeTab),
+    spyOn(document, 'querySelector').and.callFake(selector =>
+      selector === `${tabSelector} a[href="#bogus"]` ? null : fakeTab,
     );
     spyOn(fakeTab, 'click');
 
diff --git a/spec/javascripts/vue_mr_widget/components/mr_widget_rebase_spec.js b/spec/javascripts/vue_mr_widget/components/mr_widget_rebase_spec.js
index 14d6e8d7556..300133dc602 100644
--- a/spec/javascripts/vue_mr_widget/components/mr_widget_rebase_spec.js
+++ b/spec/javascripts/vue_mr_widget/components/mr_widget_rebase_spec.js
@@ -44,7 +44,10 @@ describe('Merge request widget rebase component', () => {
         .textContent.trim();
 
       expect(text).toContain('Fast-forward merge is not possible.');
-      expect(text).toContain('Rebase the source branch onto the target branch or merge target');
+      expect(text.replace(/\s\s+/g, ' ')).toContain(
+        'Rebase the source branch onto the target branch or merge target',
+      );
+
       expect(text).toContain('branch into source branch to allow this merge request to be merged.');
     });
 
@@ -78,7 +81,7 @@ describe('Merge request widget rebase component', () => {
       expect(text).toContain('Fast-forward merge is not possible.');
       expect(text).toContain('Rebase the source branch onto');
       expect(text).toContain('foo');
-      expect(text).toContain('to allow this merge request to be merged.');
+      expect(text.replace(/\s\s+/g, ' ')).toContain('to allow this merge request to be merged.');
     });
   });
 
diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_missing_branch_spec.js b/spec/javascripts/vue_mr_widget/components/states/mr_widget_missing_branch_spec.js
index 096301837c4..5fd8093bf5c 100644
--- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_missing_branch_spec.js
+++ b/spec/javascripts/vue_mr_widget/components/states/mr_widget_missing_branch_spec.js
@@ -33,7 +33,7 @@ describe('MRWidgetMissingBranch', () => {
 
       expect(el.classList.contains('mr-widget-body')).toBeTruthy();
       expect(el.querySelector('button').getAttribute('disabled')).toBeTruthy();
-      expect(content).toContain('source branch does not exist.');
+      expect(content.replace(/\s\s+/g, ' ')).toContain('source branch does not exist.');
       expect(content).toContain('Please restore it or use a different source branch');
     });
   });
diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_nothing_to_merge_spec.js b/spec/javascripts/vue_mr_widget/components/states/mr_widget_nothing_to_merge_spec.js
index babb8cea0ab..bd0bd36ebc2 100644
--- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_nothing_to_merge_spec.js
+++ b/spec/javascripts/vue_mr_widget/components/states/mr_widget_nothing_to_merge_spec.js
@@ -19,7 +19,9 @@ describe('NothingToMerge', () => {
         "Currently there are no changes in this merge request's source branch",
       );
 
-      expect(vm.$el.innerText).toContain('Please push new commits or use a different branch.');
+      expect(vm.$el.innerText.replace(/\s\s+/g, ' ')).toContain(
+        'Please push new commits or use a different branch.',
+      );
     });
 
     it('should not show new blob link if there is no link available', () => {
diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_wip_spec.js b/spec/javascripts/vue_mr_widget/components/states/mr_widget_wip_spec.js
index 88937df2f7b..7b1d589dcf8 100644
--- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_wip_spec.js
+++ b/spec/javascripts/vue_mr_widget/components/states/mr_widget_wip_spec.js
@@ -85,7 +85,9 @@ describe('Wip', () => {
       expect(el.innerText).toContain('This is a Work in Progress');
       expect(el.querySelector('button').getAttribute('disabled')).toBeTruthy();
       expect(el.querySelector('button').innerText).toContain('Merge');
-      expect(el.querySelector('.js-remove-wip').innerText).toContain('Resolve WIP status');
+      expect(el.querySelector('.js-remove-wip').innerText.replace(/\s\s+/g, ' ')).toContain(
+        'Resolve WIP status',
+      );
     });
 
     it('should not show removeWIP button is user cannot update MR', done => {