projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
16480: Merge branch 'master'
[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 6ec9e9f05d5ad7cdeff29cda76c20abbe7a4eae1..91d939516485328ba492717b55d60ba9de216793 100644
(file)
--- a/
services/api/test/factories/user.rb
+++ b/
services/api/test/factories/user.rb
@@
-1,11
+1,15
@@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
class CurrentApiClientHelper
extend CurrentApiClient
end
class CurrentApiClientHelper
extend CurrentApiClient
end
-Factory
Girl
.define do
+Factory
Bot
.define do
factory :user do
factory :user do
-
ignore
do
- join_groups
[]
+
transient
do
+ join_groups
{ [] }
end
after :create do |user, evaluator|
CurrentApiClientHelper.act_as_system_user do
end
after :create do |user, evaluator|
CurrentApiClientHelper.act_as_system_user do
@@
-21,13
+25,13
@@
FactoryGirl.define do
end
end
end
end
end
end
- first_name
"Factory"
- last_name
"Factory"
+ first_name
{ "Factory" }
+ last_name
{ "Factory" }
identity_url do
"https://example.com/#{rand(2**24).to_s(36)}"
end
factory :active_user do
identity_url do
"https://example.com/#{rand(2**24).to_s(36)}"
end
factory :active_user do
- is_active
true
+ is_active
{ true }
after :create do |user|
CurrentApiClientHelper.act_as_system_user do
Link.create!(tail_uuid: user.uuid,
after :create do |user|
CurrentApiClientHelper.act_as_system_user do
Link.create!(tail_uuid: user.uuid,