projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
10181: Merge branch 'master' into 10181-incremental-log
[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..344e571ef70bc12f3fbf331ef89c7170490b485c 100644
(file)
--- a/
services/api/test/factories/user.rb
+++ b/
services/api/test/factories/user.rb
@@
-1,12
+1,18
@@
-include CurrentApiClient
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
+class CurrentApiClientHelper
+ extend CurrentApiClient
+end
FactoryGirl.define do
factory :user do
FactoryGirl.define do
factory :user do
-
ignore
do
+
transient
do
join_groups []
end
after :create do |user, evaluator|
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,
evaluator.join_groups.each do |g|
Link.create!(tail_uuid: user.uuid,
head_uuid: g.uuid,
@@
-27,7
+33,7
@@
FactoryGirl.define do
factory :active_user do
is_active true
after :create do |user|
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',
Link.create!(tail_uuid: user.uuid,
head_uuid: Group.where('uuid ~ ?', '-f+$').first.uuid,
link_class: 'permission',
@@
-36,7
+42,7
@@
FactoryGirl.define do
end
end
to_create do |instance|
end
end
to_create do |instance|
- act_as_system_user do
+
CurrentApiClientHelper.
act_as_system_user do
instance.save!
end
end
instance.save!
end
end