Commit b1cad3f0cd8e52cda874108145f0db268dffa369
1 parent
7b324eb6
Exists in
staging
and in
31 other branches
return the old implementation of create_admin_user
Showing
1 changed file
with
2 additions
and
8 deletions
Show diff stats
test/support/factories.rb
| @@ -64,17 +64,11 @@ module Noosfero::Factory | @@ -64,17 +64,11 @@ module Noosfero::Factory | ||
| 64 | end | 64 | end |
| 65 | 65 | ||
| 66 | ###### old stuff to be rearranged | 66 | ###### old stuff to be rearranged |
| 67 | - def create_admin_user(env, activate = false) | ||
| 68 | - admin_user = new_admin_user(env, activate) | ||
| 69 | - admin_user.login | ||
| 70 | - end | ||
| 71 | - | ||
| 72 | - def new_admin_user(env, activate = true) | 67 | + def create_admin_user(env) |
| 73 | admin_user = User.find_by(login: 'adminuser') || create_user('adminuser', :email => 'adminuser@noosfero.org', :password => 'adminuser', :password_confirmation => 'adminuser', :environment => env) | 68 | admin_user = User.find_by(login: 'adminuser') || create_user('adminuser', :email => 'adminuser@noosfero.org', :password => 'adminuser', :password_confirmation => 'adminuser', :environment => env) |
| 74 | 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_trusted_sites', 'manage_environment_validators', 'manage_environment_users', 'manage_environment_organizations', 'manage_environment_templates', 'manage_environment_licenses', 'edit_appearance']) | 69 | 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_trusted_sites', 'manage_environment_validators', 'manage_environment_users', 'manage_environment_organizations', 'manage_environment_templates', 'manage_environment_licenses', 'edit_appearance']) |
| 75 | create(RoleAssignment, :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]) | 70 | create(RoleAssignment, :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]) |
| 76 | - admin_user.activate if activate | ||
| 77 | - admin_user | 71 | + admin_user.login |
| 78 | end | 72 | end |
| 79 | 73 | ||
| 80 | def create_environment(domainname) | 74 | def create_environment(domainname) |