Commit f3e3f13d authored by Mike Greiling's avatar Mike Greiling

Merge branch '327686-fe-specs' into 'master'

Update default branch name in FE specs

See merge request gitlab-org/gitlab!60992
parents 955611ea 58b1d4f3
...@@ -1464,8 +1464,8 @@ export const mockJobsQueryResponse = { ...@@ -1464,8 +1464,8 @@ export const mockJobsQueryResponse = {
__typename: 'DetailedStatus', __typename: 'DetailedStatus',
}, },
id: 'gid://gitlab/Ci::Build/2336', id: 'gid://gitlab/Ci::Build/2336',
refName: 'master', refName: 'main',
refPath: '/root/ci-project/-/commits/master', refPath: '/root/ci-project/-/commits/main',
tags: [], tags: [],
shortSha: '4408fa2a', shortSha: '4408fa2a',
commitPath: '/root/ci-project/-/commit/4408fa2a27aaadfdf42d8dda3d6a9c01ce6cad78', commitPath: '/root/ci-project/-/commit/4408fa2a27aaadfdf42d8dda3d6a9c01ce6cad78',
......
...@@ -46,16 +46,16 @@ export const mockTagRefs = ['1.0.0', '1.1.0', '1.2.0']; ...@@ -46,16 +46,16 @@ export const mockTagRefs = ['1.0.0', '1.1.0', '1.2.0'];
export const mockVariables = [ export const mockVariables = [
{ {
uniqueId: 'var-refs/heads/master2', uniqueId: 'var-refs/heads/main2',
variable_type: 'env_var', variable_type: 'env_var',
key: 'var_without_value', key: 'var_without_value',
value: '', value: '',
}, },
{ {
uniqueId: 'var-refs/heads/master3', uniqueId: 'var-refs/heads/main3',
variable_type: 'env_var', variable_type: 'env_var',
key: 'var_with_value', key: 'var_with_value',
value: 'test_value', value: 'test_value',
}, },
{ uniqueId: 'var-refs/heads/master4', variable_type: 'env_var', key: '', value: '' }, { uniqueId: 'var-refs/heads/main4', variable_type: 'env_var', key: '', value: '' },
]; ];
...@@ -7,7 +7,7 @@ jest.mock('~/lib/utils/csrf', () => ({ token: 'mock-csrf-token' })); ...@@ -7,7 +7,7 @@ jest.mock('~/lib/utils/csrf', () => ({ token: 'mock-csrf-token' }));
const projectCompareIndexPath = 'some/path'; const projectCompareIndexPath = 'some/path';
const refsProjectPath = 'some/refs/path'; const refsProjectPath = 'some/refs/path';
const paramsFrom = 'master'; const paramsFrom = 'main';
const paramsTo = 'some-other-branch'; const paramsTo = 'some-other-branch';
describe('CompareApp component', () => { describe('CompareApp component', () => {
......
...@@ -9,7 +9,7 @@ const defaultProps = { ...@@ -9,7 +9,7 @@ const defaultProps = {
refsProjectPath: 'some/refs/path', refsProjectPath: 'some/refs/path',
revisionText: 'Target', revisionText: 'Target',
paramsName: 'from', paramsName: 'from',
paramsBranch: 'master', paramsBranch: 'main',
}; };
jest.mock('~/flash'); jest.mock('~/flash');
......
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