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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
f1357a1e
Commit
f1357a1e
authored
7 years ago
by
Matija Čupić
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove references of project.cluster from specs
parent
a42b43ce
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
app/controllers/projects/clusters_controller.rb
app/controllers/projects/clusters_controller.rb
+1
-1
spec/controllers/projects/clusters_controller_spec.rb
spec/controllers/projects/clusters_controller_spec.rb
+2
-2
spec/migrations/migrate_gcp_clusters_to_new_clusters_architectures_spec.rb
...igrate_gcp_clusters_to_new_clusters_architectures_spec.rb
+2
-2
No files found.
app/controllers/projects/clusters_controller.rb
View file @
f1357a1e
...
@@ -75,7 +75,7 @@ class Projects::ClustersController < Projects::ApplicationController
...
@@ -75,7 +75,7 @@ class Projects::ClustersController < Projects::ApplicationController
end
end
format
.
html
do
format
.
html
do
flash
[
:notice
]
=
"Cluster was successfully updated."
flash
[
:notice
]
=
"Cluster was successfully updated."
redirect_to
project_cluster_path
(
project
,
project
.
cluster
)
redirect_to
project_cluster_path
(
project
,
cluster
)
end
end
end
end
else
else
...
...
This diff is collapsed.
Click to expand it.
spec/controllers/projects/clusters_controller_spec.rb
View file @
f1357a1e
...
@@ -255,7 +255,7 @@ describe Projects::ClustersController do
...
@@ -255,7 +255,7 @@ describe Projects::ClustersController do
it
'creates a new cluster'
do
it
'creates a new cluster'
do
expect
(
ClusterProvisionWorker
).
to
receive
(
:perform_async
)
expect
(
ClusterProvisionWorker
).
to
receive
(
:perform_async
)
expect
{
go
}.
to
change
{
Clusters
::
Cluster
.
count
}
expect
{
go
}.
to
change
{
Clusters
::
Cluster
.
count
}
expect
(
response
).
to
redirect_to
(
project_cluster_path
(
project
,
project
.
cluster
))
expect
(
response
).
to
redirect_to
(
project_cluster_path
(
project
,
project
.
cluster
s
.
last
))
end
end
end
end
end
end
...
@@ -422,7 +422,7 @@ describe Projects::ClustersController do
...
@@ -422,7 +422,7 @@ describe Projects::ClustersController do
go
go
cluster
.
reload
cluster
.
reload
expect
(
response
).
to
redirect_to
(
project_cluster_path
(
project
,
project
.
cluster
))
expect
(
response
).
to
redirect_to
(
project_cluster_path
(
project
,
cluster
))
expect
(
flash
[
:notice
]).
to
eq
(
'Cluster was successfully updated.'
)
expect
(
flash
[
:notice
]).
to
eq
(
'Cluster was successfully updated.'
)
expect
(
cluster
.
enabled
).
to
be_falsey
expect
(
cluster
.
enabled
).
to
be_falsey
end
end
...
...
This diff is collapsed.
Click to expand it.
spec/migrations/migrate_gcp_clusters_to_new_clusters_architectures_spec.rb
View file @
f1357a1e
...
@@ -57,7 +57,7 @@ describe MigrateGcpClustersToNewClustersArchitectures, :migration do
...
@@ -57,7 +57,7 @@ describe MigrateGcpClustersToNewClustersArchitectures, :migration do
expect
(
cluster
.
platform_type
).
to
eq
(
'kubernetes'
)
expect
(
cluster
.
platform_type
).
to
eq
(
'kubernetes'
)
expect
(
cluster
.
project
).
to
eq
(
project
)
expect
(
cluster
.
project
).
to
eq
(
project
)
expect
(
project
.
cluster
).
to
eq
(
cluster
)
expect
(
project
.
cluster
s
).
to
include
(
cluster
)
expect
(
cluster
.
provider_gcp
.
cluster
).
to
eq
(
cluster
)
expect
(
cluster
.
provider_gcp
.
cluster
).
to
eq
(
cluster
)
expect
(
cluster
.
provider_gcp
.
status
).
to
eq
(
status
)
expect
(
cluster
.
provider_gcp
.
status
).
to
eq
(
status
)
...
@@ -134,7 +134,7 @@ describe MigrateGcpClustersToNewClustersArchitectures, :migration do
...
@@ -134,7 +134,7 @@ describe MigrateGcpClustersToNewClustersArchitectures, :migration do
expect
(
cluster
.
platform_type
).
to
eq
(
'kubernetes'
)
expect
(
cluster
.
platform_type
).
to
eq
(
'kubernetes'
)
expect
(
cluster
.
project
).
to
eq
(
project
)
expect
(
cluster
.
project
).
to
eq
(
project
)
expect
(
project
.
cluster
).
to
eq
(
cluster
)
expect
(
project
.
cluster
s
).
to
include
(
cluster
)
expect
(
cluster
.
provider_gcp
.
cluster
).
to
eq
(
cluster
)
expect
(
cluster
.
provider_gcp
.
cluster
).
to
eq
(
cluster
)
expect
(
cluster
.
provider_gcp
.
status
).
to
eq
(
status
)
expect
(
cluster
.
provider_gcp
.
status
).
to
eq
(
status
)
...
...
This diff is collapsed.
Click to expand it.
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