diff options
author | Mayra Cabrera <mcabrera@gitlab.com> | 2018-03-21 08:59:40 -0600 |
---|---|---|
committer | Mayra Cabrera <mcabrera@gitlab.com> | 2018-03-22 14:52:33 -0600 |
commit | ca59bfdc6657fc20a27e93f41fc9e38c41498389 (patch) | |
tree | fb1a7397b1940445dc7c41ba8133027df2812258 /spec/controllers/projects | |
parent | fbb83069deaad3db1239af66e6c9dc913f29f8f8 (diff) | |
download | gitlab-ce-ca59bfdc6657fc20a27e93f41fc9e38c41498389.tar.gz |
Rearrange DeploymentPlatform methods
- Change find_cluster_platform_kubernetes to ignore environment argument
- Fix broken specs
CE Port of: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5047/
Diffstat (limited to 'spec/controllers/projects')
-rw-r--r-- | spec/controllers/projects/clusters_controller_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/controllers/projects/clusters_controller_spec.rb b/spec/controllers/projects/clusters_controller_spec.rb index 15ce418d0d6..82b20e12850 100644 --- a/spec/controllers/projects/clusters_controller_spec.rb +++ b/spec/controllers/projects/clusters_controller_spec.rb @@ -18,7 +18,7 @@ describe Projects::ClustersController do context 'when project has one or more clusters' do let(:project) { create(:project) } let!(:enabled_cluster) { create(:cluster, :provided_by_gcp, projects: [project]) } - let!(:disabled_cluster) { create(:cluster, :disabled, :provided_by_gcp, projects: [project]) } + let!(:disabled_cluster) { create(:cluster, :disabled, :provided_by_gcp, :production_environment, projects: [project]) } it 'lists available clusters' do go @@ -32,7 +32,7 @@ describe Projects::ClustersController do before do allow(Clusters::Cluster).to receive(:paginates_per).and_return(1) - create_list(:cluster, 2, :provided_by_gcp, projects: [project]) + create_list(:cluster, 2, :provided_by_gcp, :production_environment, projects: [project]) get :index, namespace_id: project.namespace, project_id: project, page: last_page end |