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
6e46df33
Commit
6e46df33
authored
Nov 28, 2017
by
Matija Čupić
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update ClustersController to match new scope logic
parent
3de1ba6c
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
spec/controllers/projects/clusters_controller_spec.rb
spec/controllers/projects/clusters_controller_spec.rb
+3
-3
No files found.
spec/controllers/projects/clusters_controller_spec.rb
View file @
6e46df33
...
@@ -26,7 +26,7 @@ describe Projects::ClustersController do
...
@@ -26,7 +26,7 @@ describe Projects::ClustersController do
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
render_template
(
:index
)
expect
(
response
).
to
render_template
(
:index
)
expect
(
assigns
(
:clusters
)).
to
eq
(
clusters
)
expect
(
assigns
(
:clusters
)).
to
match_array
(
clusters
)
end
end
it
'assigns counters to correct values'
do
it
'assigns counters to correct values'
do
...
@@ -48,7 +48,7 @@ describe Projects::ClustersController do
...
@@ -48,7 +48,7 @@ describe Projects::ClustersController do
context
'when only enabled clusters are requested'
do
context
'when only enabled clusters are requested'
do
it
'returns only enabled clusters'
do
it
'returns only enabled clusters'
do
get
:index
,
namespace_id:
project
.
namespace
.
to_param
,
project_id:
project
,
scope:
'
enabled
'
get
:index
,
namespace_id:
project
.
namespace
.
to_param
,
project_id:
project
,
scope:
'
active
'
clusters
=
assigns
(
:clusters
)
clusters
=
assigns
(
:clusters
)
expect
(
clusters
.
all?
{
|
cluster
|
cluster
.
enabled
==
true
}).
to
eq
(
true
)
expect
(
clusters
.
all?
{
|
cluster
|
cluster
.
enabled
==
true
}).
to
eq
(
true
)
end
end
...
@@ -56,7 +56,7 @@ describe Projects::ClustersController do
...
@@ -56,7 +56,7 @@ describe Projects::ClustersController do
context
'when only disabled clusters are requested'
do
context
'when only disabled clusters are requested'
do
it
'returns only disabled clusters'
do
it
'returns only disabled clusters'
do
get
:index
,
namespace_id:
project
.
namespace
.
to_param
,
project_id:
project
,
scope:
'
disabled
'
get
:index
,
namespace_id:
project
.
namespace
.
to_param
,
project_id:
project
,
scope:
'
inactive
'
clusters
=
assigns
(
:clusters
)
clusters
=
assigns
(
:clusters
)
expect
(
clusters
.
all?
{
|
cluster
|
cluster
.
enabled
==
false
}).
to
eq
(
true
)
expect
(
clusters
.
all?
{
|
cluster
|
cluster
.
enabled
==
false
}).
to
eq
(
true
)
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