Create a super_user factory.

diff --git a/test/controllers/user_roles_controller_test.rb b/test/controllers/user_roles_controller_test.rb
index ef1a57cbe92b2c3f114bb3e106a62f3e2e83f5d8..c7e5926ad442c65eb3d43e66c3232abb5e8f5a2d 100644 (file)
--- a/test/controllers/user_roles_controller_test.rb
+++ b/test/controllers/user_roles_controller_test.rb
@@ -20,11 +20,7 @@ class UserRolesControllerTest < ActionController::TestCase
     target_user = create(:user)
     normal_user = create(:user)
     administrator_user = create(:administrator_user)
     target_user = create(:user)
     normal_user = create(:user)
     administrator_user = create(:administrator_user)

-    # Create a super user which has all known roles
-    super_user = create(:user)
-    UserRole::ALL_ROLES.each do |role|
-      create(:user_role, :user => super_user, :granter => administrator_user, :role => role)
-    end
+    super_user = create(:super_user)

 
     # Granting should fail when not logged in
     post :grant, :display_name => target_user.display_name, :role => "moderator"
 
     # Granting should fail when not logged in
     post :grant, :display_name => target_user.display_name, :role => "moderator"


@@ -85,11 +81,7 @@ class UserRolesControllerTest < ActionController::TestCase
     target_user = create(:user)
     normal_user = create(:user)
     administrator_user = create(:administrator_user)
     target_user = create(:user)
     normal_user = create(:user)
     administrator_user = create(:administrator_user)

-    # Create a super user which has all known roles
-    super_user = create(:user)
-    UserRole::ALL_ROLES.each do |role|
-      create(:user_role, :user => super_user, :granter => administrator_user, :role => role)
-    end
+    super_user = create(:super_user)

 
     # Revoking should fail when not logged in
     post :revoke, :display_name => target_user.display_name, :role => "moderator"
 
     # Revoking should fail when not logged in
     post :revoke, :display_name => target_user.display_name, :role => "moderator"

diff --git a/test/factories/user.rb b/test/factories/user.rb
index 802fedd91c71cdb25e4e053b04ff287b36211b4a..8fe768410594dd8e4bf63bc60bab9bdb699a2ec3 100644 (file)
--- a/test/factories/user.rb
+++ b/test/factories/user.rb
@@ -46,5 +46,13 @@ FactoryGirl.define do
         create(:user_role, :role => "administrator", :user => user)
       end
     end
         create(:user_role, :role => "administrator", :user => user)
       end
     end

+
+    factory :super_user do
+      after(:create) do |user, _evaluator|
+        UserRole::ALL_ROLES.each do |role|
+          create(:user_role, :role => role, :user => user)
+        end
+      end
+    end

   end
 end
   end
 end