Download as
Browse Code »

Commit d8427ca1dffd148cbf26f8cd6671b4ed0dc50e13

Authored by Leandro Nunes dos Santos
Committed by Rodrigo Souto
1 parent eb17fc65
Exists in master and in 23 other branches activate_plugin, api_fixies, api_tasks, article_blog_visualization_format, article_layout_refactoring, article_layout_temp, blog_page_bug, clone_article, communities_ratings, design_template, event_layout, fix_forum, fix_optional_fields, fix_suggest_article, folder_improvments, manage_organization, merge_deactive_and_ban, news_page, script_to_update, stable, template_mirror_block, tests, tests_fixies

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
  Diff comments   View file @d8427ca
@@ -11,10 +11,16 @@ class UsersControllerTest < ActionController::TestCase @@ -11,10 +11,16 @@ class UsersControllerTest < ActionController::TestCase
11 @request = ActionController::TestRequest.new 11 @request = ActionController::TestRequest.new
12 @response = ActionController::TestResponse.new 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 login_as('adminuser') 19 login_as('adminuser')
16 end 20 end
17 21
  22 + attr_accessor :environment
  23 +
18 should 'not access without right permission' do 24 should 'not access without right permission' do
19 create_user('guest') 25 create_user('guest')
20 login_as 'guest' 26 login_as 'guest'
@@ -63,6 +69,7 @@ class UsersControllerTest < ActionController::TestCase @@ -63,6 +69,7 @@ class UsersControllerTest < ActionController::TestCase
63 69
64 should 'set admin role' do 70 should 'set admin role' do
65 person = create_user.person 71 person = create_user.person
  72 + Role.create!(:name => 'Admin', :key => 'environment_administrator', :environment_id => environment.id, :permissions => ['view_environment_admin_panel'])
66 assert_equal false, person.is_admin? 73 assert_equal false, person.is_admin?
67 post :set_admin_role, :id => person.id, :q => '' 74 post :set_admin_role, :id => person.id, :q => ''
68 person.reload 75 person.reload
@@ -70,8 +77,9 @@ class UsersControllerTest < ActionController::TestCase @@ -70,8 +77,9 @@ class UsersControllerTest < ActionController::TestCase
70 end 77 end
71 78
72 should 'reset admin role' do 79 should 'reset admin role' do
73 - environment = Environment.default  
74 person = create_user.person 80 person = create_user.person
  81 + Role.create!(:name => 'Admin', :key => 'environment_administrator', :environment_id => environment.id, :permissions => ['view_environment_admin_panel'])
  82 +
75 environment.add_admin(person) 83 environment.add_admin(person)
76 assert person.is_admin? 84 assert person.is_admin?
77 85