From d8427ca1dffd148cbf26f8cd6671b4ed0dc50e13 Mon Sep 17 00:00:00 2001 From: Leandro Nunes dos Santos Date: Tue, 7 Jan 2014 18:59:14 -0300 Subject: [PATCH] UsersController: make the functionals tests self contained --- test/functional/users_controller_test.rb | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/test/functional/users_controller_test.rb b/test/functional/users_controller_test.rb index bedce5e..8bf9d89 100644 --- a/test/functional/users_controller_test.rb +++ b/test/functional/users_controller_test.rb @@ -11,10 +11,16 @@ class UsersControllerTest < ActionController::TestCase @request = ActionController::TestRequest.new @response = ActionController::TestResponse.new - admin_user = create_user_with_permission('adminuser', 'manage_environment_users', Environment.default) + Environment.destroy_all + @environment = fast_create(Environment, :is_default => true) + + + admin_user = create_user_with_permission('adminuser', 'manage_environment_users', environment) login_as('adminuser') end + attr_accessor :environment + should 'not access without right permission' do create_user('guest') login_as 'guest' @@ -63,6 +69,7 @@ class UsersControllerTest < ActionController::TestCase should 'set admin role' do person = create_user.person + Role.create!(:name => 'Admin', :key => 'environment_administrator', :environment_id => environment.id, :permissions => ['view_environment_admin_panel']) assert_equal false, person.is_admin? post :set_admin_role, :id => person.id, :q => '' person.reload @@ -70,8 +77,9 @@ class UsersControllerTest < ActionController::TestCase end should 'reset admin role' do - environment = Environment.default person = create_user.person + Role.create!(:name => 'Admin', :key => 'environment_administrator', :environment_id => environment.id, :permissions => ['view_environment_admin_panel']) + environment.add_admin(person) assert person.is_admin? -- libgit2 0.21.2