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/branches/components')
-rw-r--r--spec/frontend/branches/components/__snapshots__/divergence_graph_spec.js.snap4
-rw-r--r--spec/frontend/branches/components/divergence_graph_spec.js12
2 files changed, 8 insertions, 8 deletions
diff --git a/spec/frontend/branches/components/__snapshots__/divergence_graph_spec.js.snap b/spec/frontend/branches/components/__snapshots__/divergence_graph_spec.js.snap
index 261c406171e..2afca66b0c1 100644
--- a/spec/frontend/branches/components/__snapshots__/divergence_graph_spec.js.snap
+++ b/spec/frontend/branches/components/__snapshots__/divergence_graph_spec.js.snap
@@ -3,7 +3,7 @@
exports[`Branch divergence graph component renders ahead and behind count 1`] = `
<div
class="divergence-graph px-2 d-none d-md-block"
- title="10 commits behind master, 10 commits ahead"
+ title="10 commits behind main, 10 commits ahead"
>
<graph-bar-stub
count="10"
@@ -26,7 +26,7 @@ exports[`Branch divergence graph component renders ahead and behind count 1`] =
exports[`Branch divergence graph component renders distance count 1`] = `
<div
class="divergence-graph px-2 d-none d-md-block"
- title="More than 900 commits different with master"
+ title="More than 900 commits different with main"
>
<graph-bar-stub
count="900"
diff --git a/spec/frontend/branches/components/divergence_graph_spec.js b/spec/frontend/branches/components/divergence_graph_spec.js
index b54b2ceb233..3b565539f87 100644
--- a/spec/frontend/branches/components/divergence_graph_spec.js
+++ b/spec/frontend/branches/components/divergence_graph_spec.js
@@ -15,7 +15,7 @@ describe('Branch divergence graph component', () => {
it('renders ahead and behind count', () => {
factory({
- defaultBranch: 'master',
+ defaultBranch: 'main',
aheadCount: 10,
behindCount: 10,
maxCommits: 100,
@@ -27,18 +27,18 @@ describe('Branch divergence graph component', () => {
it('sets title for ahead and behind count', () => {
factory({
- defaultBranch: 'master',
+ defaultBranch: 'main',
aheadCount: 10,
behindCount: 10,
maxCommits: 100,
});
- expect(vm.attributes('title')).toBe('10 commits behind master, 10 commits ahead');
+ expect(vm.attributes('title')).toBe('10 commits behind main, 10 commits ahead');
});
it('renders distance count', () => {
factory({
- defaultBranch: 'master',
+ defaultBranch: 'main',
aheadCount: 0,
behindCount: 0,
distance: 900,
@@ -55,13 +55,13 @@ describe('Branch divergence graph component', () => {
${1100} | ${'999+'}
`('sets title for $distance as $titleText', ({ distance, titleText }) => {
factory({
- defaultBranch: 'master',
+ defaultBranch: 'main',
aheadCount: 0,
behindCount: 0,
distance,
maxCommits: 100,
});
- expect(vm.attributes('title')).toBe(`More than ${titleText} commits different with master`);
+ expect(vm.attributes('title')).toBe(`More than ${titleText} commits different with main`);
});
});