Commit 0927b183 authored by Mark Florian's avatar Mark Florian

Merge branch '327686-update-environments-table-specs' into 'master'

Update default branch name in environments specs

See merge request gitlab-org/gitlab!59850
parents 998830c0 a821d83b
......@@ -9,8 +9,8 @@ export const environment = {
iid: 6,
sha: '500aabcb17c97bdcf2d0c410b70cb8556f0362dd',
ref: {
name: 'master',
ref_url: 'root/ci-folders/tree/master',
name: 'main',
ref_url: 'root/ci-folders/tree/main',
},
tag: true,
'last?': true,
......
......@@ -359,7 +359,7 @@ describe('Environment table', () => {
},
},
{
name: 'review/master',
name: 'review/main',
last_deployment: {
created_at: '2019-02-17T16:26:15.125Z',
},
......@@ -374,7 +374,7 @@ describe('Environment table', () => {
},
];
const [production, review, staging] = mockItems;
const [addcibuildstatus, master] = mockItems[1].children;
const [addcibuildstatus, main] = mockItems[1].children;
factory({
propsData: {
......@@ -390,7 +390,7 @@ describe('Environment table', () => {
production.name,
]);
expect(wrapper.vm.sortedEnvironments[0].children).toEqual([master, addcibuildstatus]);
expect(wrapper.vm.sortedEnvironments[0].children).toEqual([main, addcibuildstatus]);
});
});
});
......@@ -76,8 +76,8 @@ const environment = {
iid: 6,
sha: '500aabcb17c97bdcf2d0c410b70cb8556f0362dd',
ref: {
name: 'master',
ref_url: 'root/ci-folders/tree/master',
name: 'main',
ref_url: 'root/ci-folders/tree/main',
},
tag: true,
'last?': true,
......@@ -130,8 +130,8 @@ const environment = {
iid: 27,
sha: '1132df044b73943943c949e7ac2c2f120a89bf59',
ref: {
name: 'master',
ref_path: '/root/environment-test/-/tree/master',
name: 'main',
ref_path: '/root/environment-test/-/tree/main',
},
status: 'running',
created_at: '2020-12-04T19:57:49.514Z',
......
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