diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 18:44:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 18:44:42 +0300 |
commit | 4555e1b21c365ed8303ffb7a3325d773c9b8bf31 (patch) | |
tree | 5423a1c7516cffe36384133ade12572cf709398d /spec/frontend/branches/components/divergence_graph_spec.js | |
parent | e570267f2f6b326480d284e0164a6464ba4081bc (diff) |
Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42
Diffstat (limited to 'spec/frontend/branches/components/divergence_graph_spec.js')
-rw-r--r-- | spec/frontend/branches/components/divergence_graph_spec.js | 12 |
1 files changed, 6 insertions, 6 deletions
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`); }); }); |