Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
c451b7e8
Commit
c451b7e8
authored
Apr 22, 2021
by
Jacques Erasmus
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update master to main
Uodated the default branch name
parent
0927b183
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
12 deletions
+12
-12
spec/frontend/branches/components/__snapshots__/divergence_graph_spec.js.snap
...es/components/__snapshots__/divergence_graph_spec.js.snap
+2
-2
spec/frontend/branches/components/divergence_graph_spec.js
spec/frontend/branches/components/divergence_graph_spec.js
+6
-6
spec/frontend/branches/divergence_graph_spec.js
spec/frontend/branches/divergence_graph_spec.js
+4
-4
No files found.
spec/frontend/branches/components/__snapshots__/divergence_graph_spec.js.snap
View file @
c451b7e8
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
exports[`Branch divergence graph component renders ahead and behind count 1`] = `
exports[`Branch divergence graph component renders ahead and behind count 1`] = `
<div
<div
class="divergence-graph px-2 d-none d-md-block"
class="divergence-graph px-2 d-none d-md-block"
title="10 commits behind ma
ster
, 10 commits ahead"
title="10 commits behind ma
in
, 10 commits ahead"
>
>
<graph-bar-stub
<graph-bar-stub
count="10"
count="10"
...
@@ -26,7 +26,7 @@ exports[`Branch divergence graph component renders ahead and behind count 1`] =
...
@@ -26,7 +26,7 @@ exports[`Branch divergence graph component renders ahead and behind count 1`] =
exports[`Branch divergence graph component renders distance count 1`] = `
exports[`Branch divergence graph component renders distance count 1`] = `
<div
<div
class="divergence-graph px-2 d-none d-md-block"
class="divergence-graph px-2 d-none d-md-block"
title="More than 900 commits different with ma
ster
"
title="More than 900 commits different with ma
in
"
>
>
<graph-bar-stub
<graph-bar-stub
count="900"
count="900"
...
...
spec/frontend/branches/components/divergence_graph_spec.js
View file @
c451b7e8
...
@@ -15,7 +15,7 @@ describe('Branch divergence graph component', () => {
...
@@ -15,7 +15,7 @@ describe('Branch divergence graph component', () => {
it
(
'
renders ahead and behind count
'
,
()
=>
{
it
(
'
renders ahead and behind count
'
,
()
=>
{
factory
({
factory
({
defaultBranch
:
'
ma
ster
'
,
defaultBranch
:
'
ma
in
'
,
aheadCount
:
10
,
aheadCount
:
10
,
behindCount
:
10
,
behindCount
:
10
,
maxCommits
:
100
,
maxCommits
:
100
,
...
@@ -27,18 +27,18 @@ describe('Branch divergence graph component', () => {
...
@@ -27,18 +27,18 @@ describe('Branch divergence graph component', () => {
it
(
'
sets title for ahead and behind count
'
,
()
=>
{
it
(
'
sets title for ahead and behind count
'
,
()
=>
{
factory
({
factory
({
defaultBranch
:
'
ma
ster
'
,
defaultBranch
:
'
ma
in
'
,
aheadCount
:
10
,
aheadCount
:
10
,
behindCount
:
10
,
behindCount
:
10
,
maxCommits
:
100
,
maxCommits
:
100
,
});
});
expect
(
vm
.
attributes
(
'
title
'
)).
toBe
(
'
10 commits behind ma
ster
, 10 commits ahead
'
);
expect
(
vm
.
attributes
(
'
title
'
)).
toBe
(
'
10 commits behind ma
in
, 10 commits ahead
'
);
});
});
it
(
'
renders distance count
'
,
()
=>
{
it
(
'
renders distance count
'
,
()
=>
{
factory
({
factory
({
defaultBranch
:
'
ma
ster
'
,
defaultBranch
:
'
ma
in
'
,
aheadCount
:
0
,
aheadCount
:
0
,
behindCount
:
0
,
behindCount
:
0
,
distance
:
900
,
distance
:
900
,
...
@@ -55,13 +55,13 @@ describe('Branch divergence graph component', () => {
...
@@ -55,13 +55,13 @@ describe('Branch divergence graph component', () => {
${
1100
}
|
${
'
999+
'
}
${
1100
}
|
${
'
999+
'
}
`
(
'
sets title for $distance as $titleText
'
,
({
distance
,
titleText
})
=>
{
`
(
'
sets title for $distance as $titleText
'
,
({
distance
,
titleText
})
=>
{
factory
({
factory
({
defaultBranch
:
'
ma
ster
'
,
defaultBranch
:
'
ma
in
'
,
aheadCount
:
0
,
aheadCount
:
0
,
behindCount
:
0
,
behindCount
:
0
,
distance
,
distance
,
maxCommits
:
100
,
maxCommits
:
100
,
});
});
expect
(
vm
.
attributes
(
'
title
'
)).
toBe
(
`More than
${
titleText
}
commits different with ma
ster
`
);
expect
(
vm
.
attributes
(
'
title
'
)).
toBe
(
`More than
${
titleText
}
commits different with ma
in
`
);
});
});
});
});
spec/frontend/branches/divergence_graph_spec.js
View file @
c451b7e8
...
@@ -9,14 +9,14 @@ describe('Divergence graph', () => {
...
@@ -9,14 +9,14 @@ describe('Divergence graph', () => {
mock
=
new
MockAdapter
(
axios
);
mock
=
new
MockAdapter
(
axios
);
mock
.
onGet
(
'
/-/diverging_counts
'
).
reply
(
200
,
{
mock
.
onGet
(
'
/-/diverging_counts
'
).
reply
(
200
,
{
ma
ster
:
{
ahead
:
1
,
behind
:
1
},
ma
in
:
{
ahead
:
1
,
behind
:
1
},
'
test/hello-world
'
:
{
ahead
:
1
,
behind
:
1
},
'
test/hello-world
'
:
{
ahead
:
1
,
behind
:
1
},
});
});
jest
.
spyOn
(
axios
,
'
get
'
);
jest
.
spyOn
(
axios
,
'
get
'
);
document
.
body
.
innerHTML
=
`
document
.
body
.
innerHTML
=
`
<div class="js-branch-item" data-name="ma
ster
"><div class="js-branch-divergence-graph"></div></div>
<div class="js-branch-item" data-name="ma
in
"><div class="js-branch-divergence-graph"></div></div>
<div class="js-branch-item" data-name="test/hello-world"><div class="js-branch-divergence-graph"></div></div>
<div class="js-branch-item" data-name="test/hello-world"><div class="js-branch-divergence-graph"></div></div>
`
;
`
;
});
});
...
@@ -28,7 +28,7 @@ describe('Divergence graph', () => {
...
@@ -28,7 +28,7 @@ describe('Divergence graph', () => {
it
(
'
calls axios get with list of branch names
'
,
()
=>
it
(
'
calls axios get with list of branch names
'
,
()
=>
init
(
'
/-/diverging_counts
'
).
then
(()
=>
{
init
(
'
/-/diverging_counts
'
).
then
(()
=>
{
expect
(
axios
.
get
).
toHaveBeenCalledWith
(
'
/-/diverging_counts
'
,
{
expect
(
axios
.
get
).
toHaveBeenCalledWith
(
'
/-/diverging_counts
'
,
{
params
:
{
names
:
[
'
ma
ster
'
,
'
test/hello-world
'
]
},
params
:
{
names
:
[
'
ma
in
'
,
'
test/hello-world
'
]
},
});
});
}));
}));
...
@@ -46,7 +46,7 @@ describe('Divergence graph', () => {
...
@@ -46,7 +46,7 @@ describe('Divergence graph', () => {
it
(
'
creates Vue components
'
,
()
=>
it
(
'
creates Vue components
'
,
()
=>
init
(
'
/-/diverging_counts
'
).
then
(()
=>
{
init
(
'
/-/diverging_counts
'
).
then
(()
=>
{
expect
(
document
.
querySelector
(
'
[data-name="ma
ster
"]
'
).
innerHTML
).
not
.
toEqual
(
''
);
expect
(
document
.
querySelector
(
'
[data-name="ma
in
"]
'
).
innerHTML
).
not
.
toEqual
(
''
);
expect
(
document
.
querySelector
(
'
[data-name="test/hello-world"]
'
).
innerHTML
).
not
.
toEqual
(
''
);
expect
(
document
.
querySelector
(
'
[data-name="test/hello-world"]
'
).
innerHTML
).
not
.
toEqual
(
''
);
}));
}));
});
});
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment