X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/754d85439d5e9a835562689dee597b782932914f..29b0dccdf90d3cf1e7472f0653cc9a38cbbadc26:/services/api/test/factories/user.rb

diff --git a/services/api/test/factories/user.rb b/services/api/test/factories/user.rb
index 7c48fc0ccc..56e9125217 100644
--- a/services/api/test/factories/user.rb
+++ b/services/api/test/factories/user.rb
@@ -2,12 +2,22 @@ include CurrentApiClient
 
 FactoryGirl.define do
   factory :user do
-    before :create do
-      Thread.current[:user_was] = Thread.current[:user]
-      Thread.current[:user] = system_user
+    ignore do
+      join_groups []
     end
-    after :create do
-      Thread.current[:user] = Thread.current[:user_was]
+    after :create do |user, evaluator|
+      act_as_system_user do
+        evaluator.join_groups.each do |g|
+          Link.create!(tail_uuid: user.uuid,
+                       head_uuid: g.uuid,
+                       link_class: 'permission',
+                       name: 'can_read')
+          Link.create!(tail_uuid: g.uuid,
+                       head_uuid: user.uuid,
+                       link_class: 'permission',
+                       name: 'can_read')
+        end
+      end
     end
     first_name "Factory"
     last_name "Factory"
@@ -25,5 +35,10 @@ FactoryGirl.define do
         end
       end
     end
+    to_create do |instance|
+      act_as_system_user do
+        instance.save!
+      end
+    end
   end
 end