Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42

1 files changed, 17 insertions, 17 deletions

diff --git a/spec/frontend/ide/utils_spec.js b/spec/frontend/ide/utils_spec.js
index f467d174eeb..00733615f81 100644
--- a/spec/frontend/ide/utils_spec.js
+++ b/spec/frontend/ide/utils_spec.js
@@ -274,33 +274,33 @@ describe('WebIDE utils', () => {
    *  hello.md -> hello-1.md
    *  hello_2.md -> hello_3.md
    *  hello_ -> hello_1
-   *  master-patch-22432 -> master-patch-22433
+   *  main-patch-22432 -> main-patch-22433
    *  patch_332 -> patch_333
    */
 
   describe('addNumericSuffix', () => {
     it.each`
-      input                   | output
-      ${'hello'}              | ${'hello-1'}
-      ${'hello2'}             | ${'hello-3'}
-      ${'hello.md'}           | ${'hello-1.md'}
-      ${'hello_2.md'}         | ${'hello_3.md'}
-      ${'hello_'}             | ${'hello_1'}
-      ${'master-patch-22432'} | ${'master-patch-22433'}
-      ${'patch_332'}          | ${'patch_333'}
+      input                 | output
+      ${'hello'}            | ${'hello-1'}
+      ${'hello2'}           | ${'hello-3'}
+      ${'hello.md'}         | ${'hello-1.md'}
+      ${'hello_2.md'}       | ${'hello_3.md'}
+      ${'hello_'}           | ${'hello_1'}
+      ${'main-patch-22432'} | ${'main-patch-22433'}
+      ${'patch_332'}        | ${'patch_333'}
     `('adds a numeric suffix to a given filename/branch name: $input', ({ input, output }) => {
       expect(addNumericSuffix(input)).toBe(output);
     });
 
     it.each`
-      input                   | output
-      ${'hello'}              | ${'hello-39135'}
-      ${'hello2'}             | ${'hello-39135'}
-      ${'hello.md'}           | ${'hello-39135.md'}
-      ${'hello_2.md'}         | ${'hello_39135.md'}
-      ${'hello_'}             | ${'hello_39135'}
-      ${'master-patch-22432'} | ${'master-patch-39135'}
-      ${'patch_332'}          | ${'patch_39135'}
+      input                 | output
+      ${'hello'}            | ${'hello-39135'}
+      ${'hello2'}           | ${'hello-39135'}
+      ${'hello.md'}         | ${'hello-39135.md'}
+      ${'hello_2.md'}       | ${'hello_39135.md'}
+      ${'hello_'}           | ${'hello_39135'}
+      ${'main-patch-22432'} | ${'main-patch-39135'}
+      ${'patch_332'}        | ${'patch_39135'}
     `('adds a random suffix if randomize=true is passed for name: $input', ({ input, output }) => {
       jest.spyOn(Math, 'random').mockReturnValue(0.391352525);