summaryrefslogtreecommitdiff
path: root/spec/controllers
diff options
context:
space:
mode:
authorThong Kuah <tkuah@gitlab.com>2018-11-01 13:39:01 +1300
committerThong Kuah <tkuah@gitlab.com>2018-11-01 19:37:33 +1300
commit1a1fdf8efe1923ba781e978e858c009264020e72 (patch)
treedf98af221d7a722e4c67db450b78a5488bff6a3c /spec/controllers
parent28dabc67f4db8271ac20c0db458ae2c86a906eee (diff)
downloadgitlab-ce-1a1fdf8efe1923ba781e978e858c009264020e72.tar.gz
Resolve controller sharing concern
Use ClustersController as base while having Projects::ClustersController to inform what `clusterable` is. Thanks @ayufan for the great suggestion ! - View changes to work with new approach - Fix javascript for new approach - Fix feature specs for new approach - Fix QA
Diffstat (limited to 'spec/controllers')
-rw-r--r--spec/controllers/projects/clusters/applications_controller_spec.rb (renamed from spec/controllers/clusters/applications_controller_spec.rb)2
-rw-r--r--spec/controllers/projects/clusters_controller_spec.rb (renamed from spec/controllers/clusters_controller_spec.rb)6
2 files changed, 4 insertions, 4 deletions
diff --git a/spec/controllers/clusters/applications_controller_spec.rb b/spec/controllers/projects/clusters/applications_controller_spec.rb
index 12846795f3e..8106453a775 100644
--- a/spec/controllers/clusters/applications_controller_spec.rb
+++ b/spec/controllers/projects/clusters/applications_controller_spec.rb
@@ -2,7 +2,7 @@
require 'spec_helper'
-describe Clusters::ApplicationsController do
+describe Projects::Clusters::ApplicationsController do
include AccessMatchersForController
def current_application
diff --git a/spec/controllers/clusters_controller_spec.rb b/spec/controllers/projects/clusters_controller_spec.rb
index defcc08c70e..64fa787e469 100644
--- a/spec/controllers/clusters_controller_spec.rb
+++ b/spec/controllers/projects/clusters_controller_spec.rb
@@ -2,7 +2,7 @@
require 'spec_helper'
-describe ClustersController do
+describe Projects::ClustersController do
include AccessMatchersForController
include GoogleApi::CloudPlatformHelpers
@@ -320,11 +320,11 @@ describe ClustersController do
end
end
- describe 'GET status' do
+ describe 'GET cluster_status' do
let(:cluster) { create(:cluster, :providing_by_gcp, projects: [project]) }
def go
- get :status,
+ get :cluster_status,
namespace_id: project.namespace.to_param,
project_id: project.to_param,
id: cluster,