Merge branch '326997-master-to-main-extension' into 'master'

Update default initial branch name in the CI schema extension

See merge request gitlab-org/gitlab!63881

app/assets/javascripts/editor/extensions/editor_ci_schema_ext.js

@@ -14,9 +14,9 @@ export class CiSchemaExtension extends EditorLiteExtension {
    * @param {Object} opts
    * @param {String} opts.projectNamespace
    * @param {String} opts.projectPath
-   * @param {String?} opts.ref - Current ref. Defaults to master
+   * @param {String?} opts.ref - Current ref. Defaults to main
    */
-  registerCiSchema({ projectNamespace, projectPath, ref = 'master' } = {}) {
+  registerCiSchema({ projectNamespace, projectPath, ref } = {}) {
     const ciSchemaPath = Api.buildUrl(Api.projectFileSchemaPath)
       .replace(':namespace_path', projectNamespace)
       .replace(':project_path', projectPath)

app/assets/javascripts/pipeline_editor/components/editor/text_editor.vue

@@ -10,7 +10,7 @@ export default {
     EditorLite,
   },
   mixins: [glFeatureFlagMixin()],
-  inject: ['ciConfigPath', 'projectPath', 'projectNamespace'],
+  inject: ['ciConfigPath', 'projectPath', 'projectNamespace', 'defaultBranch'],
   inheritAttrs: false,
   data() {
     return {
@@ -34,7 +34,7 @@ export default {
         editorInstance.registerCiSchema({
           projectPath: this.projectPath,
           projectNamespace: this.projectNamespace,
-          ref: this.commitSha,
+          ref: this.commitSha || this.defaultBranch,
         });
       }
     },

spec/frontend/editor/editor_ci_schema_ext_spec.js

@@ -4,6 +4,8 @@ import { EXTENSION_CI_SCHEMA_FILE_NAME_MATCH } from '~/editor/constants';
 import EditorLite from '~/editor/editor_lite';
 import { CiSchemaExtension } from '~/editor/extensions/editor_ci_schema_ext';
 
+const mockRef = 'AABBCCDD';
+
 describe('~/editor/editor_ci_config_ext', () => {
   const defaultBlobPath = '.gitlab-ci.yml';
 
@@ -75,8 +77,6 @@ describe('~/editor/editor_ci_config_ext', () => {
       });
 
       it('with an schema uri that contains project and ref', () => {
-        const mockRef = 'AABBCCDD';
-
         instance.registerCiSchema({
           projectNamespace: mockProjectNamespace,
           projectPath: mockProjectPath,
@@ -95,10 +95,11 @@ describe('~/editor/editor_ci_config_ext', () => {
         instance.registerCiSchema({
           projectNamespace: mockProjectNamespace,
           projectPath: mockProjectPath,
+          ref: mockRef,
         });
 
         expect(getConfiguredYmlSchema()).toEqual({
-          uri: `${TEST_HOST}/${mockProjectNamespace}/${mockProjectPath}/-/schema/master/${EXTENSION_CI_SCHEMA_FILE_NAME_MATCH}`,
+          uri: `${TEST_HOST}/${mockProjectNamespace}/${mockProjectPath}/-/schema/${mockRef}/${EXTENSION_CI_SCHEMA_FILE_NAME_MATCH}`,
           fileMatch: ['another-ci-filename.yml'],
         });
       });

spec/frontend/pipeline_editor/components/editor/text_editor_spec.js

@@ -9,6 +9,7 @@ import {
   mockCommitSha,
   mockProjectPath,
   mockProjectNamespace,
+  mockDefaultBranch,
 } from '../../mock_data';
 
 describe('Pipeline Editor | Text editor component', () => {
@@ -38,6 +39,7 @@ describe('Pipeline Editor | Text editor component', () => {
         projectPath: mockProjectPath,
         projectNamespace: mockProjectNamespace,
         ciConfigPath: mockCiConfigPath,
+        defaultBranch: mockDefaultBranch,
         glFeatures,
       },
       attrs: {