root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Use ClustersFinder for setting counts

This commit is contained in:
Matija Čupić 2017-12-05 16:12:11 +01:00
parent f81503a061
commit 4d75901c02
No known key found for this signature in database
GPG Key ID: 4BAF84FFACD2E5DE
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/controllers/projects/clusters_controller.rb
View File

@ -9,10 +9,9 @@ class Projects::ClustersController < Projects::ApplicationController
def index def index
@scope = params[:scope] || 'all' @scope = params[:scope] || 'all'
clusters = ClustersFinder.new(project, current_user, @scope).execute @clusters = ClustersFinder.new(project, current_user, @scope).execute.page(params[:page])
@clusters = clusters.page(params[:page]) @active_count = ClustersFinder.new(project, current_user, :active).execute.count
@active_count = project.clusters.enabled.count @inactive_count = ClustersFinder.new(project, current_user, :inactive).execute.count
@inactive_count = project.clusters.disabled.count
@all_count = @active_count + @inactive_count @all_count = @active_count + @inactive_count
end end

9
spec/controllers/projects/clusters_controller_spec.rb
View File

@ -17,9 +17,8 @@ describe Projects::ClustersController do
context 'when project has one or more clusters' do context 'when project has one or more clusters' do
let(:project) { create(:project) } let(:project) { create(:project) }
let(:enabled_cluster) { create(:cluster, :provided_by_gcp, projects: [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, projects: [project]) }
it 'lists available clusters' do it 'lists available clusters' do
go go
@ -31,8 +30,8 @@ describe Projects::ClustersController do
it 'assigns counters to correct values' do it 'assigns counters to correct values' do
go go
expect(assigns(:active_count)).to eq(project.clusters.enabled.count) expect(assigns(:active_count)).to eq(1)
expect(assigns(:inactive_count)).to eq(project.clusters.disabled.count) expect(assigns(:inactive_count)).to eq(1)
end end
context 'when page is specified' do context 'when page is specified' do