X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/4dbe0b01c464d4f6c29e215afb394fd7e842a1cc..ec3e655812817f4d7935629f397d0508f961bd9e:/apps/workbench/test/integration/application_layout_test.rb diff --git a/apps/workbench/test/integration/application_layout_test.rb b/apps/workbench/test/integration/application_layout_test.rb index e3441c4b3d..6ec535b7b6 100644 --- a/apps/workbench/test/integration/application_layout_test.rb +++ b/apps/workbench/test/integration/application_layout_test.rb @@ -94,52 +94,6 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest end end - # test manage_account page - def verify_manage_account user - if user && user['is_active'] - within('.navbar-fixed-top') do - find('a', text: "#{user['email']}").click - within('.dropdown-menu') do - find('a', text: 'Manage account').click - end - end - - # now in manage account page - assert page.has_text?('Virtual Machines'), 'No text - Virtual Machines' - assert page.has_text?('Repositories'), 'No text - Repositories' - assert page.has_text?('SSH Keys'), 'No text - SSH Keys' - assert page.has_text?('Current Token'), 'No text - Current Token' - - assert page.has_text?('The Arvados API token is a secret key that enables the Arvados SDKs to access Arvados'), 'No text - Arvados API token' - - click_link 'Add new SSH key' - - within '.modal-content' do - assert page.has_text?('Public Key'), 'No text - Public Key' - assert page.has_button?('Cancel'), 'No button - Cancel' - assert page.has_button?('Submit'), 'No button - Submit' - - page.find_field('public_key').set 'first test with an incorrect ssh key value' - click_button 'Submit' - assert page.has_text?('Public key does not appear to be a valid ssh-rsa or dsa public key'), 'No text - Public key does not appear to be a valid' - - public_key_str = api_fixture('authorized_keys')['active']['public_key'] - page.find_field('public_key').set public_key_str - page.find_field('name').set 'added_in_test' - click_button 'Submit' - assert page.has_text?('Public key already exists in the database, use a different key.'), 'No text - Public key already exists' - - new_key = SSHKey.generate - page.find_field('public_key').set new_key.ssh_public_key - page.find_field('name').set 'added_in_test' - click_button 'Submit' - end - - # key must be added. look for it in the refreshed page - assert page.has_text?('added_in_test'), 'No text - added_in_test' - end - end - [ [nil, nil, false, false], ['inactive', api_fixture('users')['inactive'], true, false], @@ -169,21 +123,15 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest check_help_menu end - end - - [ - ['active', api_fixture('users')['active']], - ['admin', api_fixture('users')['admin']], - ].each do |token, user| test "test system menu for user #{token}" do - visit page_with_token(token) - verify_system_menu user - end + if !token + visit ('/') + else + visit page_with_token(token) + end - test "test manage account for user #{token}" do - visit page_with_token(token) - verify_manage_account user + verify_system_menu user end end end