Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42

1 files changed, 4 insertions, 7 deletions

diff --git a/spec/frontend/vue_mr_widget/components/states/mr_widget_conflicts_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_conflicts_spec.js
index ad21e6e6f4f..f5a059698b6 100644
--- a/spec/frontend/vue_mr_widget/components/states/mr_widget_conflicts_spec.js
+++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_conflicts_spec.js
@@ -54,7 +54,7 @@ describe('MRWidgetConflicts', () => {
     vm.destroy();
   });
 
-  [false, true].forEach(featureEnabled => {
+  [false, true].forEach((featureEnabled) => {
     describe(`with GraphQL feature flag ${featureEnabled ? 'enabled' : 'disabled'}`, () => {
       beforeEach(() => {
         mergeRequestWidgetGraphql = featureEnabled;
@@ -167,12 +167,9 @@ describe('MRWidgetConflicts', () => {
             },
           });
 
-          expect(
-            vm
-              .text()
-              .trim()
-              .replace(/\s\s+/g, ' '),
-          ).toContain('ask someone with write access');
+          expect(vm.text().trim().replace(/\s\s+/g, ' ')).toContain(
+            'ask someone with write access',
+          );
         });
 
         it('should not have action buttons', async () => {