Download as
Browse Code »

Commit 6879a995a434ab037c3d282f6f5199f41480f2ee

Authored by MoisesMachado
1 parent e878dae3
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

ActionItem392: fixed the test_helper to not use 'root' to identify the admin and… 

… account_controller_test to expect a name call instead of a identifier


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2032 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
test/functional/account_controller_test.rb
  Diff comments   View file @6879a99
@@ -208,7 +208,7 @@ class AccountControllerTest < Test::Unit::TestCase @@ -208,7 +208,7 @@ class AccountControllerTest < Test::Unit::TestCase
208 change = ChangePassword.new 208 change = ChangePassword.new
209 ChangePassword.expects(:find_by_code).with('osidufgiashfkjsadfhkj99999').returns(change) 209 ChangePassword.expects(:find_by_code).with('osidufgiashfkjsadfhkj99999').returns(change)
210 person = mock 210 person = mock
211 - person.stubs(:identifier).returns('joe') 211 + person.stubs(:name).returns('joe')
212 change.stubs(:requestor).returns(person) 212 change.stubs(:requestor).returns(person)
213 213
214 get :new_password, :code => 'osidufgiashfkjsadfhkj99999' 214 get :new_password, :code => 'osidufgiashfkjsadfhkj99999'
test/test_helper.rb
  Diff comments   View file @6879a99
@@ -63,7 +63,7 @@ class Test::Unit::TestCase @@ -63,7 +63,7 @@ class Test::Unit::TestCase
63 end 63 end
64 64
65 def create_admin_user(env) 65 def create_admin_user(env)
66 - admin_user = User.find_by_login('root') || User.create!(:login => 'root', :email => 'root@noosfero.org', :password => 'root', :password_confirmation => 'root') 66 + admin_user = User.find_by_login('root_user') || User.create!(:login => 'root_user', :email => 'root@noosfero.org', :password => 'root', :password_confirmation => 'root')
67 admin_role = Role.find_by_name('admin_role') || Role.create!(:name => 'admin_role', :permissions => ['view_environment_admin_panel','edit_environment_features', 'edit_environment_design', 'manage_environment_categories', 'manage_environment_roles', 'manage_environment_validators']) 67 admin_role = Role.find_by_name('admin_role') || Role.create!(:name => 'admin_role', :permissions => ['view_environment_admin_panel','edit_environment_features', 'edit_environment_design', 'manage_environment_categories', 'manage_environment_roles', 'manage_environment_validators'])
68 RoleAssignment.create!(:accessor => admin_user.person, :role => admin_role, :resource => env) unless admin_user.person.role_assignments.map{|ra|[ra.role, ra.accessor, ra.resource]}.include?([admin_role, admin_user, env]) 68 RoleAssignment.create!(:accessor => admin_user.person, :role => admin_role, :resource => env) unless admin_user.person.role_assignments.map{|ra|[ra.role, ra.accessor, ra.resource]}.include?([admin_role, admin_user, env])
69 admin_user.login 69 admin_user.login