Merge branch '10467-client-disconnect' refs #10467

[arvados.git] / services / api / test / factories / user.rb

diff --git a/services/api/test/factories/user.rb b/services/api/test/factories/user.rb
index 56e91252171d4ab4d70c633dc69ceaebe95505b1..a0e5ad95dc32a0210d28577c2b899d05c53fd3f1 100644 (file)
--- a/services/api/test/factories/user.rb
+++ b/services/api/test/factories/user.rb
@@ -1,12 +1,14 @@
-include CurrentApiClient
+class CurrentApiClientHelper
+  extend CurrentApiClient
+end
 
 FactoryGirl.define do
   factory :user do
-    ignore do
+    transient do
       join_groups []
     end
     after :create do |user, evaluator|
-      act_as_system_user do
+      CurrentApiClientHelper.act_as_system_user do
         evaluator.join_groups.each do |g|
           Link.create!(tail_uuid: user.uuid,
                        head_uuid: g.uuid,
@@ -27,7 +29,7 @@ FactoryGirl.define do
     factory :active_user do
       is_active true
       after :create do |user|
-        act_as_system_user do
+        CurrentApiClientHelper.act_as_system_user do
           Link.create!(tail_uuid: user.uuid,
                        head_uuid: Group.where('uuid ~ ?', '-f+$').first.uuid,
                        link_class: 'permission',
@@ -36,7 +38,7 @@ FactoryGirl.define do
       end
     end
     to_create do |instance|
-      act_as_system_user do
+      CurrentApiClientHelper.act_as_system_user do
         instance.save!
       end
     end