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