projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2879: Support tag search in "in docker" Job filters.
[arvados.git]
/
services
/
api
/
test
/
functional
/
arvados
/
v1
/
users_controller_test.rb
diff --git
a/services/api/test/functional/arvados/v1/users_controller_test.rb
b/services/api/test/functional/arvados/v1/users_controller_test.rb
index b6bb20574745c02ce8c3c5dc3b55a952c030deaa..04e74aae6123f0bc4d0a15b9e1a70a702341f04a 100644
(file)
--- a/
services/api/test/functional/arvados/v1/users_controller_test.rb
+++ b/
services/api/test/functional/arvados/v1/users_controller_test.rb
@@
-13,7
+13,7
@@
class Arvados::V1::UsersControllerTest < ActionController::TestCase
get :current
assert_response :success
me = JSON.parse(@response.body)
get :current
assert_response :success
me = JSON.parse(@response.body)
- post :activate,
uu
id: me['uuid']
+ post :activate, id: me['uuid']
assert_response :success
assert_not_nil assigns(:object)
me = JSON.parse(@response.body)
assert_response :success
assert_not_nil assigns(:object)
me = JSON.parse(@response.body)
@@
-49,7
+49,7
@@
class Arvados::V1::UsersControllerTest < ActionController::TestCase
me = JSON.parse(@response.body)
assert_equal false, me['is_active']
me = JSON.parse(@response.body)
assert_equal false, me['is_active']
- post :activate,
uu
id: me['uuid']
+ post :activate, id: me['uuid']
assert_response 403
get :current
assert_response 403
get :current
@@
-63,7
+63,7
@@
class Arvados::V1::UsersControllerTest < ActionController::TestCase
get :current
assert_response :success
me = JSON.parse(@response.body)
get :current
assert_response :success
me = JSON.parse(@response.body)
- post :activate,
uu
id: me['uuid']
+ post :activate, id: me['uuid']
assert_response :success
me = JSON.parse(@response.body)
assert_equal true, me['is_active']
assert_response :success
me = JSON.parse(@response.body)
assert_equal true, me['is_active']
@@
-144,6
+144,7
@@
class Arvados::V1::UsersControllerTest < ActionController::TestCase
email: "foo@example.com"
}
}
email: "foo@example.com"
}
}
+ assert_response :success
response_items = JSON.parse(@response.body)['items']
response_items = JSON.parse(@response.body)['items']
@@
-697,7
+698,7
@@
class Arvados::V1::UsersControllerTest < ActionController::TestCase
verify_link_existence created['uuid'], created['email'], true, true, true, true, false
# now unsetup this user
verify_link_existence created['uuid'], created['email'], true, true, true, true, false
# now unsetup this user
- post :unsetup,
uu
id: created['uuid']
+ post :unsetup, id: created['uuid']
assert_response :success
created2 = JSON.parse(@response.body)
assert_response :success
created2 = JSON.parse(@response.body)
@@
-717,12
+718,12
@@
class Arvados::V1::UsersControllerTest < ActionController::TestCase
assert active_user['is_invited'], 'expected is_invited for active user'
verify_link_existence active_user['uuid'], active_user['email'],
assert active_user['is_invited'], 'expected is_invited for active user'
verify_link_existence active_user['uuid'], active_user['email'],
- false,
fals
e, false, true, true
+ false,
tru
e, false, true, true
authorize_with :admin
# now unsetup this user
authorize_with :admin
# now unsetup this user
- post :unsetup,
uu
id: active_user['uuid']
+ post :unsetup, id: active_user['uuid']
assert_response :success
response_user = JSON.parse(@response.body)
assert_response :success
response_user = JSON.parse(@response.body)
@@
-795,6
+796,7
@@
class Arvados::V1::UsersControllerTest < ActionController::TestCase
def find_obj_in_resp (response_items, object_type, head_kind=nil)
return_obj = nil
def find_obj_in_resp (response_items, object_type, head_kind=nil)
return_obj = nil
+ response_items
response_items.each { |x|
if !x
next
response_items.each { |x|
if !x
next