projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 1970-folder-view
[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..1fefcb6c681c265ae73eeb987b5b29946d17ff97 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']
@@
-697,7
+697,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)
@@
-722,7
+722,7
@@
class Arvados::V1::UsersControllerTest < ActionController::TestCase
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)