Commit 1d09e554 authored by Jacques Erasmus's avatar Jacques Erasmus Committed by Miguel Rincon

Update master to main

Updated the default branch name
parent 7aee55b0
......@@ -18,7 +18,7 @@ describe('BranchDetails component', () => {
uri: sourceUri,
},
targetBranch: {
name: 'master',
name: 'main',
uri: targetUri,
},
},
......@@ -40,13 +40,13 @@ describe('BranchDetails component', () => {
});
it('has the correct text', () => {
expect(getText()).toEqual('feature into master');
expect(getText()).toEqual('feature into main');
});
});
describe('and one branch URI', () => {
beforeEach(() => {
wrapper = createComponent({ targetUri: '/master-uri' });
wrapper = createComponent({ targetUri: '/main-uri' });
});
it('has one link', () => {
......@@ -58,13 +58,13 @@ describe('BranchDetails component', () => {
});
it('has the correct text', () => {
expect(getText()).toEqual('feature into master');
expect(getText()).toEqual('feature into main');
});
});
describe('and both branch URIs', () => {
beforeEach(() => {
wrapper = createComponent({ sourceUri: '/feature-uri', targetUri: '/master-uri' });
wrapper = createComponent({ sourceUri: '/feature-uri', targetUri: '/main-uri' });
});
it('has two links', () => {
......@@ -80,7 +80,7 @@ describe('BranchDetails component', () => {
});
it('has the correct text', () => {
expect(getText()).toEqual('feature into master');
expect(getText()).toEqual('feature into main');
});
});
});
......
......@@ -80,7 +80,7 @@ describe('MergeRequestsGrid component', () => {
wrapper = createComponent(
createMergeRequests({
count: 2,
props: { target_branch: 'master', source_branch: 'feature' },
props: { target_branch: 'main', source_branch: 'feature' },
}),
);
expect(findBranchDetails().exists()).toBe(true);
......
......@@ -10,8 +10,8 @@ localVue.use(Vuex);
describe('Filter component', () => {
const projectId = 1;
const jobs = [
{ ref: 'master', name: 'fuzz' },
{ ref: 'master', name: 'fuzz 2' },
{ ref: 'main', name: 'fuzz' },
{ ref: 'main', name: 'fuzz 2' },
];
let wrapper;
......
......@@ -26,7 +26,7 @@ export const generateVulnerabilities = () => [
resolvedOnDefaultBranch: true,
location: {
image:
'registry.gitlab.com/groulot/container-scanning-test/master:5f21de6956aee99ddb68ae49498662d9872f50ff',
'registry.gitlab.com/groulot/container-scanning-test/main:5f21de6956aee99ddb68ae49498662d9872f50ff',
},
project: {
nameWithNamespace: 'Administrator / Security reports',
......
......@@ -177,7 +177,7 @@ export default [
},
category: 'sast',
feedback_type: 'dismissal',
branch: 'master',
branch: 'main',
project_fingerprint: '4e5b6966dd100170b4b1ad599c7058cce91b57b4',
destroy_vulnerability_feedback_dismissal_path: 'https://example.com/feedback_dismissal_path',
},
......@@ -258,7 +258,7 @@ export default [
issue_url: 'http://localhost/namespace1/project1/issues/1',
category: 'sast',
feedback_type: 'issue',
branch: 'master',
branch: 'main',
project_fingerprint: '4e5b6966dd100170b4b1ad599c7058cce91b57b4',
},
create_vulnerability_feedback_issue_path: 'https://example.com/vulnerability_feedback',
......@@ -336,7 +336,7 @@ export default [
},
category: 'sast',
feedback_type: 'dismissal',
branch: 'master',
branch: 'main',
project_fingerprint: '4e5b6966dd100170b4b1ad599c7058cce91b57b4',
destroy_vulnerability_feedback_dismissal_path: 'https://example.com/feedback_dismissal_path',
},
......@@ -362,7 +362,7 @@ export default [
issue_url: 'http://localhost/namespace1/project1/issues/1',
category: 'sast',
feedback_type: 'issue',
branch: 'master',
branch: 'main',
project_fingerprint: '4e5b6966dd100170b4b1ad599c7058cce91b57b4',
},
create_vulnerability_feedback_issue_path: 'https://example.com/vulnerability_feedback',
......@@ -496,7 +496,7 @@ export default [
issue_url: null,
category: 'sast',
feedback_type: 'issue',
branch: 'master',
branch: 'main',
project_fingerprint: '4e5b6966dd100170b4b1ad599c7058cce91b57b4',
},
vulnerability_feedback_issue_path: 'https://example.com/vulnerability_feedback',
......@@ -562,7 +562,7 @@ export default [
],
location: {
image:
'registry.gitlab.com/groulot/container-scanning-test/master:5f21de6956aee99ddb68ae49498662d9872f50ff',
'registry.gitlab.com/groulot/container-scanning-test/main:5f21de6956aee99ddb68ae49498662d9872f50ff',
operating_system: 'debian:9',
dependency: {
package: {
......@@ -620,7 +620,7 @@ export default [
],
location: {
image:
'registry.gitlab.com/groulot/container-scanning-test/master:5f21de6956aee99ddb68ae49498662d9872f50ff',
'registry.gitlab.com/groulot/container-scanning-test/main:5f21de6956aee99ddb68ae49498662d9872f50ff',
operating_system: 'debian:9',
dependency: {
package: {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment