Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'spec/frontend/ide/stores/utils_spec.js')
-rw-r--r--spec/frontend/ide/stores/utils_spec.js18
1 files changed, 9 insertions, 9 deletions
diff --git a/spec/frontend/ide/stores/utils_spec.js b/spec/frontend/ide/stores/utils_spec.js
index 46a0794b2e6..8f7b8c5e311 100644
--- a/spec/frontend/ide/stores/utils_spec.js
+++ b/spec/frontend/ide/stores/utils_spec.js
@@ -18,13 +18,13 @@ describe('Multi-file store utils', () => {
};
const state = {
- currentBranchId: 'master',
+ currentBranchId: 'main',
currentProjectId: 'test/test',
};
utils.setPageTitleForFile(state, f);
- expect(document.title).toBe('README.md · master · test/test · GitLab');
+ expect(document.title).toBe('README.md · main · test/test · GitLab');
});
});
@@ -52,10 +52,10 @@ describe('Multi-file store utils', () => {
{ ...file('deletedFile'), path: 'deletedFile', deleted: true },
{ ...file('renamedFile'), path: 'renamedFile', prevPath: 'prevPath' },
],
- currentBranchId: 'master',
+ currentBranchId: 'main',
};
const payload = utils.createCommitPayload({
- branch: 'master',
+ branch: 'main',
newBranch: false,
state,
rootState,
@@ -63,7 +63,7 @@ describe('Multi-file store utils', () => {
});
expect(payload).toEqual({
- branch: 'master',
+ branch: 'main',
commit_message: 'commit message',
actions: [
{
@@ -122,10 +122,10 @@ describe('Multi-file store utils', () => {
lastCommitSha: '123456789',
},
],
- currentBranchId: 'master',
+ currentBranchId: 'main',
};
const payload = utils.createCommitPayload({
- branch: 'master',
+ branch: 'main',
newBranch: false,
state: {},
rootState,
@@ -135,7 +135,7 @@ describe('Multi-file store utils', () => {
});
expect(payload).toEqual({
- branch: 'master',
+ branch: 'main',
commit_message: 'prebuilt test commit message',
actions: [
{
@@ -377,7 +377,7 @@ describe('Multi-file store utils', () => {
let localState;
let branchInfo;
const currentProjectId = '123-foo';
- const currentBranchId = 'master';
+ const currentBranchId = 'main';
beforeEach(() => {
localState = {