Commit d8427ca1dffd148cbf26f8cd6671b4ed0dc50e13
Committed by
Rodrigo Souto
1 parent
eb17fc65
Exists in
master
and in
29 other branches
UsersController: make the functionals tests self contained
Showing
1 changed file
with
10 additions
and
2 deletions
Show diff stats
test/functional/users_controller_test.rb
... | ... | @@ -11,10 +11,16 @@ class UsersControllerTest < ActionController::TestCase |
11 | 11 | @request = ActionController::TestRequest.new |
12 | 12 | @response = ActionController::TestResponse.new |
13 | 13 | |
14 | - admin_user = create_user_with_permission('adminuser', 'manage_environment_users', Environment.default) | |
14 | + Environment.destroy_all | |
15 | + @environment = fast_create(Environment, :is_default => true) | |
16 | + | |
17 | + | |
18 | + admin_user = create_user_with_permission('adminuser', 'manage_environment_users', environment) | |
15 | 19 | login_as('adminuser') |
16 | 20 | end |
17 | 21 | |
22 | + attr_accessor :environment | |
23 | + | |
18 | 24 | should 'not access without right permission' do |
19 | 25 | create_user('guest') |
20 | 26 | login_as 'guest' |
... | ... | @@ -63,6 +69,7 @@ class UsersControllerTest < ActionController::TestCase |
63 | 69 | |
64 | 70 | should 'set admin role' do |
65 | 71 | person = create_user.person |
72 | + Role.create!(:name => 'Admin', :key => 'environment_administrator', :environment_id => environment.id, :permissions => ['view_environment_admin_panel']) | |
66 | 73 | assert_equal false, person.is_admin? |
67 | 74 | post :set_admin_role, :id => person.id, :q => '' |
68 | 75 | person.reload |
... | ... | @@ -70,8 +77,9 @@ class UsersControllerTest < ActionController::TestCase |
70 | 77 | end |
71 | 78 | |
72 | 79 | should 'reset admin role' do |
73 | - environment = Environment.default | |
74 | 80 | person = create_user.person |
81 | + Role.create!(:name => 'Admin', :key => 'environment_administrator', :environment_id => environment.id, :permissions => ['view_environment_admin_panel']) | |
82 | + | |
75 | 83 | environment.add_admin(person) |
76 | 84 | assert person.is_admin? |
77 | 85 | ... | ... |