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
95779ee8
Commit
95779ee8
authored
Jul 07, 2017
by
Shinya Maeda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix spec/models/group_spec.rb(Need to be backported to CE)
parent
e8322625
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
35 additions
and
39 deletions
+35
-39
spec/models/group_spec.rb
spec/models/group_spec.rb
+35
-39
No files found.
spec/models/group_spec.rb
View file @
95779ee8
...
...
@@ -461,64 +461,60 @@ describe Group, models: true do
describe
'#secret_variables_for'
do
let
(
:project
)
{
create
(
:empty_project
,
group:
group
)
}
let!
(
:secret_variable
)
do
create
(
:ci_group_variable
,
value:
'secret'
,
group:
group
)
end
context
'when protected and unprotected variables has existsed'
do
let!
(
:secret_variable
)
do
create
(
:ci_group_variable
,
value:
'secret'
,
group:
group
)
end
let!
(
:protected_variable
)
do
create
(
:ci_group_variable
,
:protected
,
value:
'protected'
,
group:
group
)
end
let!
(
:protected_variable
)
do
create
(
:ci_group_variable
,
:protected
,
value:
'protected'
,
group:
group
)
end
subject
{
group
.
secret_variables_for
(
'ref'
,
project
)
}
subject
{
group
.
secret_variables_for
(
'ref'
,
project
)
}
shared_examples
'ref is protected'
do
it
'contains all the variables'
do
is_expected
.
to
contain_exactly
(
secret_variable
,
protected_variable
)
shared_examples
'ref is protected'
do
it
'contains all the variables'
do
is_expected
.
to
contain_exactly
(
secret_variable
,
protected_variable
)
end
end
end
context
'when the ref is not protected'
do
before
do
stub_application_setting
(
default_branch_protection:
Gitlab
::
Access
::
PROTECTION_NONE
)
end
context
'when the ref is not protected'
do
before
do
stub_application_setting
(
default_branch_protection:
Gitlab
::
Access
::
PROTECTION_NONE
)
end
it
'contains only the secret variables'
do
is_expected
.
to
contain_exactly
(
secret_variable
)
it
'contains only the secret variables'
do
is_expected
.
to
contain_exactly
(
secret_variable
)
end
end
end
context
'when the ref is a protected branch'
do
before
do
create
(
:protected_branch
,
name:
'ref'
,
project:
project
)
context
'when the ref is a protected branch'
do
before
do
create
(
:protected_branch
,
name:
'ref'
,
project:
project
)
end
it_behaves_like
'ref is protected'
end
it_behaves_like
'ref is protected'
end
context
'when the ref is a protected tag'
do
before
do
create
(
:protected_tag
,
name:
'ref'
,
project:
project
)
end
context
'when the ref is a protected tag'
do
before
do
create
(
:protected_tag
,
name:
'ref'
,
project:
project
)
it_behaves_like
'ref is protected'
end
it_behaves_like
'ref is protected'
end
context
'when group has children'
do
let!
(
:variable
)
{
create
(
:ci_group_variable
,
group:
group
)
}
let!
(
:group_child
)
{
create
(
:group
,
parent:
group
)
}
let!
(
:variable_child
)
{
create
(
:ci_group_variable
,
group:
group_child
)
}
let!
(
:group_child_3
)
{
create
(
:group
,
parent:
group_child_2
)
}
let!
(
:variable_child_3
)
{
create
(
:ci_group_variable
,
group:
group_child_3
)
}
let!
(
:group_child_2
)
{
create
(
:group
,
parent:
group_child
)
}
let!
(
:variable_child_2
)
{
create
(
:ci_group_variable
,
group:
group_child_2
)
}
it
'returns all variables belong to the group and parent groups'
do
expected_array1
=
[
protected_variable
,
secret_variable
]
expected_array2
=
[
variable_child
,
variable_child_2
,
variable_child_3
]
got_array
=
group_child_3
.
secret_variables_for
(
'ref'
,
project
).
to_a
subject
{
group_child
.
secret_variables_for
(
'ref'
,
project
)
}
expect
(
got_array
.
shift
(
2
)).
to
contain_exactly
(
*
expected_array1
)
expect
(
got_array
).
to
eq
(
expected_array2
)
it
'returns all variables belong to the group and parent groups'
do
is_expected
.
to
eq
([
variable
,
variable_child
]
)
end
end
end
...
...
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