Skip to content

Commit

Permalink
Service admins only see public servants with same dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
abisosa committed Apr 16, 2015
1 parent f4cd65b commit 18f6dde
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
2 changes: 1 addition & 1 deletion app/controllers/admins/public_servants_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ class Admins::PublicServantsController < ApplicationController
layout 'admins'

def index
@public_servants = Admin.public_servants_sorted_by_name
@public_servants = Admin.public_servants_by_dependency(current_admin.dependency)
@available_services = current_admin.managed_services
end

Expand Down
4 changes: 2 additions & 2 deletions app/models/admin.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ def self.service_admins_sorted_by_name
where(is_service_admin: true).order(name: :asc)
end

def self.public_servants_sorted_by_name
where(is_public_servant: true, disabled: false).order(name: :asc)
def self.public_servants_by_dependency(dependency)
where(is_public_servant: true, disabled: false, dependency: dependency).order(name: :asc)
end

def services_ids
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,21 @@

feature 'As a service admin I can create new public servant' do

let(:admin) { create(:admin, :service_admin) }
let(:admin) { create(:admin, :service_admin, dependency: "Dependencia 1") }

background do
sign_in_admin admin
end

scenario 'I can see a list of public servants' do
public_servants = create_list(:admin, 3, :public_servant)
scenario 'I can see a list of public servants in my dependency' do
public_servants = create_list(:admin, 3, :public_servant, dependency: admin.dependency)
other_public_servant = create :admin, :public_servant

visit admins_dashboards_path
click_link "Servidores Públicos"

expect(page).to have_content public_servants.first.name
expect(page).not_to have_content other_public_servant.name
expect(public_servants_count).to eq 3
end

Expand Down

0 comments on commit 18f6dde

Please sign in to comment.