projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 14873-api-rails5-upgrade
[arvados.git]
/
services
/
api
/
test
/
unit
/
user_test.rb
diff --git
a/services/api/test/unit/user_test.rb
b/services/api/test/unit/user_test.rb
index 72beca6c78134dbe92bd9ce4b65d8b3e70c6d530..67c410047cfb5e62ba65be801a46bd20b721971d 100644
(file)
--- a/
services/api/test/unit/user_test.rb
+++ b/
services/api/test/unit/user_test.rb
@@
-643,11
+643,11
@@
class UserTest < ActiveSupport::TestCase
assert_equal(expect_username, user.username)
# check user setup
assert_equal(expect_username, user.username)
# check user setup
- verify_link_exists(Rails.configuration.auto_setup_new_users,
+ verify_link_exists(Rails.configuration.auto_setup_new_users
|| active
,
groups(:all_users).uuid, user.uuid,
"permission", "can_read")
# Check for OID login link.
groups(:all_users).uuid, user.uuid,
"permission", "can_read")
# Check for OID login link.
- verify_link_exists(Rails.configuration.auto_setup_new_users,
+ verify_link_exists(Rails.configuration.auto_setup_new_users
|| active
,
user.uuid, user.email, "permission", "can_login")
# Check for repository.
if named_repo = (prior_repo or
user.uuid, user.email, "permission", "can_login")
# Check for repository.
if named_repo = (prior_repo or