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
9c400c57
Commit
9c400c57
authored
Apr 22, 2021
by
Jacques Erasmus
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update master to main
Updated the default branch name
parent
0927b183
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
12 deletions
+12
-12
ee/spec/frontend/approvals/components/branches_select_spec.js
...pec/frontend/approvals/components/branches_select_spec.js
+5
-5
ee/spec/frontend/approvals/components/mr_edit/mr_rules_spec.js
...ec/frontend/approvals/components/mr_edit/mr_rules_spec.js
+3
-3
ee/spec/frontend/approvals/components/rule_branches_spec.js
ee/spec/frontend/approvals/components/rule_branches_spec.js
+2
-2
ee/spec/frontend/approvals/stores/modules/mr_edit/actions_spec.js
...frontend/approvals/stores/modules/mr_edit/actions_spec.js
+2
-2
No files found.
ee/spec/frontend/approvals/components/branches_select_spec.js
View file @
9c400c57
...
...
@@ -9,7 +9,7 @@ import waitForPromises from 'helpers/wait_for_promises';
const
TEST_DEFAULT_BRANCH
=
{
name
:
'
Any branch
'
};
const
TEST_PROJECT_ID
=
'
1
'
;
const
TEST_PROTECTED_BRANCHES
=
[
{
id
:
1
,
name
:
'
ma
ster
'
},
{
id
:
1
,
name
:
'
ma
in
'
},
{
id
:
2
,
name
:
'
development
'
},
];
const
TEST_BRANCHES_SELECTIONS
=
[
TEST_DEFAULT_BRANCH
,
...
TEST_PROTECTED_BRANCHES
];
...
...
@@ -61,7 +61,7 @@ describe('Branches Select', () => {
protectedBranches
:
[
{
id
:
1
,
name
:
'
ma
ster
'
,
name
:
'
ma
in
'
,
},
],
},
...
...
@@ -70,10 +70,10 @@ describe('Branches Select', () => {
);
await
waitForPromises
();
expect
(
findDropdown
().
props
(
'
text
'
)).
toBe
(
'
ma
ster
'
);
expect
(
findDropdown
().
props
(
'
text
'
)).
toBe
(
'
ma
in
'
);
expect
(
findDropdownItems
()
.
filter
((
item
)
=>
item
.
text
()
===
'
ma
ster
'
)
.
filter
((
item
)
=>
item
.
text
()
===
'
ma
in
'
)
.
at
(
0
)
.
props
(
'
isChecked
'
),
).
toBe
(
true
);
...
...
@@ -108,7 +108,7 @@ describe('Branches Select', () => {
});
it
(
'
fetches protected branches with no any branch if there is a search
'
,
async
()
=>
{
findSearch
().
vm
.
$emit
(
'
input
'
,
'
ma
ster
'
);
findSearch
().
vm
.
$emit
(
'
input
'
,
'
ma
in
'
);
await
waitForPromises
();
expect
(
findDropdownItems
()).
toHaveLength
(
protectedBranchNames
().
length
);
...
...
ee/spec/frontend/approvals/components/mr_edit/mr_rules_spec.js
View file @
9c400c57
...
...
@@ -50,7 +50,7 @@ describe('EE Approvals MRRules', () => {
store
.
modules
.
approvals
.
state
=
{
hasLoaded
:
true
,
rules
:
[],
targetBranch
:
'
ma
ster
'
,
targetBranch
:
'
ma
in
'
,
};
store
.
modules
.
approvals
.
actions
.
putRule
=
jest
.
fn
();
});
...
...
@@ -64,7 +64,7 @@ describe('EE Approvals MRRules', () => {
});
describe
(
'
when editing a MR
'
,
()
=>
{
const
initialTargetBranch
=
'
ma
ster
'
;
const
initialTargetBranch
=
'
ma
in
'
;
let
targetBranchInputElement
;
beforeEach
(()
=>
{
...
...
@@ -96,7 +96,7 @@ describe('EE Approvals MRRules', () => {
it
(
'
re-fetches rules when target branch has changed
'
,
()
=>
{
factory
();
store
.
modules
.
approvals
.
state
.
targetBranch
=
'
ma
ster
123
'
;
store
.
modules
.
approvals
.
state
.
targetBranch
=
'
ma
in
123
'
;
return
wrapper
.
vm
.
$nextTick
().
then
(()
=>
{
expect
(
store
.
modules
.
approvals
.
actions
.
fetchRules
).
toHaveBeenCalled
();
...
...
ee/spec/frontend/approvals/components/rule_branches_spec.js
View file @
9c400c57
...
...
@@ -32,7 +32,7 @@ describe('Rule Branches', () => {
protectedBranches
:
[
{
id
:
1
,
name
:
'
ma
ster
'
,
name
:
'
ma
in
'
,
},
{
id
:
2
,
...
...
@@ -45,7 +45,7 @@ describe('Rule Branches', () => {
rule
,
});
expect
(
wrapper
.
text
()).
toContain
(
'
ma
ster
'
);
expect
(
wrapper
.
text
()).
toContain
(
'
ma
in
'
);
expect
(
wrapper
.
text
()).
not
.
toContain
(
'
hello
'
);
});
});
ee/spec/frontend/approvals/stores/modules/mr_edit/actions_spec.js
View file @
9c400c57
...
...
@@ -7,9 +7,9 @@ describe('Approval MR edit module actions', () => {
it
(
'
commits SET_TARGET_BRANCH
'
,
(
done
)
=>
{
testAction
(
actions
.
setTargetBranch
,
'
ma
ster
'
,
'
ma
in
'
,
{},
[{
type
:
types
.
SET_TARGET_BRANCH
,
payload
:
'
ma
ster
'
}],
[{
type
:
types
.
SET_TARGET_BRANCH
,
payload
:
'
ma
in
'
}],
[],
done
,
);
...
...
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