From 6e46df331b7bbbed2500e8ae084149a720d5a06c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matija=20=C4=8Cupi=C4=87?= <matteeyah@gmail.com> Date: Tue, 28 Nov 2017 14:58:23 +0100 Subject: [PATCH] Update ClustersController to match new scope logic --- spec/controllers/projects/clusters_controller_spec.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spec/controllers/projects/clusters_controller_spec.rb b/spec/controllers/projects/clusters_controller_spec.rb index 4ba331f22e4..8aeb2b35f2d 100644 --- a/spec/controllers/projects/clusters_controller_spec.rb +++ b/spec/controllers/projects/clusters_controller_spec.rb @@ -26,7 +26,7 @@ describe Projects::ClustersController do expect(response).to have_gitlab_http_status(:ok) expect(response).to render_template(:index) - expect(assigns(:clusters)).to eq(clusters) + expect(assigns(:clusters)).to match_array(clusters) end it 'assigns counters to correct values' do @@ -48,7 +48,7 @@ describe Projects::ClustersController do context 'when only enabled clusters are requested' 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) expect(clusters.all? { |cluster| cluster.enabled == true }).to eq(true) end @@ -56,7 +56,7 @@ describe Projects::ClustersController do context 'when only disabled clusters are requested' 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) expect(clusters.all? { |cluster| cluster.enabled == false }).to eq(true) end -- 2.30.9