From b1cad3f0cd8e52cda874108145f0db268dffa369 Mon Sep 17 00:00:00 2001 From: Leandro Nunes dos Santos Date: Tue, 26 Apr 2016 11:24:12 -0300 Subject: [PATCH] return the old implementation of create_admin_user --- test/support/factories.rb | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/test/support/factories.rb b/test/support/factories.rb index f1a6b67..bd35f9d 100644 --- a/test/support/factories.rb +++ b/test/support/factories.rb @@ -64,17 +64,11 @@ module Noosfero::Factory end ###### old stuff to be rearranged - def create_admin_user(env, activate = false) - admin_user = new_admin_user(env, activate) - admin_user.login - end - - def new_admin_user(env, activate = true) + def create_admin_user(env) admin_user = User.find_by(login: 'adminuser') || create_user('adminuser', :email => 'adminuser@noosfero.org', :password => 'adminuser', :password_confirmation => 'adminuser', :environment => env) 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']) 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]) - admin_user.activate if activate - admin_user + admin_user.login end def create_environment(domainname) -- libgit2 0.21.2