projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '14574-expression-fix' refs #14574
[arvados.git]
/
apps
/
workbench
/
test
/
controllers
/
users_controller_test.rb
diff --git
a/apps/workbench/test/controllers/users_controller_test.rb
b/apps/workbench/test/controllers/users_controller_test.rb
index ce9282ff77d1e69450c864d8a09f70ec2d8637e7..393b864dc53a61f3a81a91af6abd49e836a5e831 100644
(file)
--- a/
apps/workbench/test/controllers/users_controller_test.rb
+++ b/
apps/workbench/test/controllers/users_controller_test.rb
@@
-35,6
+35,14
@@
class UsersControllerTest < ActionController::TestCase
assert_match /\/users\/welcome/, @response.redirect_url
end
assert_match /\/users\/welcome/, @response.redirect_url
end
+ test "'log in as user' feature uses a v2 token" do
+ post :sudo, {
+ id: api_fixture('users')['active']['uuid']
+ }, session_for('admin_trustedclient')
+ assert_response :redirect
+ assert_match /api_token=v2%2F/, @response.redirect_url
+ end
+
test "request shell access" do
user = api_fixture('users')['spectator']
test "request shell access" do
user = api_fixture('users')['spectator']
@@
-69,14
+77,14
@@
class UsersControllerTest < ActionController::TestCase
if username == 'admin'
assert_match /<a href="\/projects\/#{admin_user['uuid']}">Home<\/a>/, @response.body
assert_match /<a href="\/projects\/#{active_user['uuid']}">Home<\/a>/, @response.body
if username == 'admin'
assert_match /<a href="\/projects\/#{admin_user['uuid']}">Home<\/a>/, @response.body
assert_match /<a href="\/projects\/#{active_user['uuid']}">Home<\/a>/, @response.body
- assert_match /href="\/users\/#{admin_user['uuid']}"
title="show user"
><i class="fa fa-fw fa-user"><\/i> Show<\/a/, @response.body
- assert_match /href="\/users\/#{active_user['uuid']}"
title="show user"
><i class="fa fa-fw fa-user"><\/i> Show<\/a/, @response.body
+ assert_match /href="\/users\/#{admin_user['uuid']}"><i class="fa fa-fw fa-user"><\/i> Show<\/a/, @response.body
+ assert_match /href="\/users\/#{active_user['uuid']}"><i class="fa fa-fw fa-user"><\/i> Show<\/a/, @response.body
assert_includes @response.body, admin_user['email']
assert_includes @response.body, active_user['email']
else
refute_match /Home<\/a>/, @response.body
assert_includes @response.body, admin_user['email']
assert_includes @response.body, active_user['email']
else
refute_match /Home<\/a>/, @response.body
- refute_match /href="\/users\/#{admin_user['uuid']}"
title="show user"
><i class="fa fa-fw fa-user"><\/i> Show<\/a/, @response.body
- assert_match /href="\/users\/#{active_user['uuid']}"
title="show user"
><i class="fa fa-fw fa-user"><\/i> Show<\/a/, @response.body
+ refute_match /href="\/users\/#{admin_user['uuid']}"><i class="fa fa-fw fa-user"><\/i> Show<\/a/, @response.body
+ assert_match /href="\/users\/#{active_user['uuid']}"><i class="fa fa-fw fa-user"><\/i> Show<\/a/, @response.body
assert_includes @response.body, active_user['email']
end
end
assert_includes @response.body, active_user['email']
end
end