X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/7df2da959b583d3646b9fde606f9e74d598d4bb9..50128b53da4003912635b03fb27b5be2c5beaca1:/apps/workbench/test/integration/users_test.rb diff --git a/apps/workbench/test/integration/users_test.rb b/apps/workbench/test/integration/users_test.rb index f5f66ec545..140cb56127 100644 --- a/apps/workbench/test/integration/users_test.rb +++ b/apps/workbench/test/integration/users_test.rb @@ -1,18 +1,16 @@ require 'integration_helper' -require 'selenium-webdriver' -require 'headless' class UsersTest < ActionDispatch::IntegrationTest test "login as active user but not admin" do - Capybara.current_driver = Capybara.javascript_driver + need_javascript visit page_with_token('active_trustedclient') assert page.has_no_link? 'Users' 'Found Users link for non-admin user' end test "login as admin user and verify active user data" do - Capybara.current_driver = Capybara.javascript_driver + need_javascript visit page_with_token('admin_trustedclient') # go to Users list page @@ -28,7 +26,7 @@ class UsersTest < ActionDispatch::IntegrationTest find('a', text: 'Show'). click assert page.has_text? 'Attributes' - assert page.has_text? 'Metadata' + assert page.has_text? 'Advanced' assert page.has_text? 'Admin' # go to the Attributes tab @@ -44,10 +42,7 @@ class UsersTest < ActionDispatch::IntegrationTest end test "create a new user" do - headless = Headless.new - headless.start - - Capybara.current_driver = :selenium + need_javascript visit page_with_token('admin_trustedclient') @@ -58,12 +53,9 @@ class UsersTest < ActionDispatch::IntegrationTest click_link 'Add a new user' - sleep(0.1) - popup = page.driver.browser.window_handles.last - page.within_window popup do - assert has_text? 'Virtual Machine' + within '.modal-content' do + find 'label', text: 'Virtual Machine' fill_in "email", :with => "foo@example.com" - fill_in "repo_name", :with => "test_repo" click_button "Submit" wait_for_ajax end @@ -73,9 +65,7 @@ class UsersTest < ActionDispatch::IntegrationTest # verify that the new user showed up in the users page and find # the new user's UUID new_user_uuid = - find('tr[data-object-uuid]', text: 'foo@example.com'). - find('td', text: '-tpzed-'). - text + find('tr[data-object-uuid]', text: 'foo@example.com')['data-object-uuid'] assert new_user_uuid, "Expected new user uuid not found" # go to the new user's page @@ -88,18 +78,14 @@ class UsersTest < ActionDispatch::IntegrationTest assert_equal "false", text, "Expected new user's is_active to be false" end + click_link 'Advanced' click_link 'Metadata' - assert page.has_text? '(Repository: test_repo)' - assert !(page.has_text? '(VirtualMachine:)') - - headless.stop + assert page.has_text? 'can_login' # make sure page is rendered / ready + assert page.has_no_text? 'VirtualMachine:' end test "setup the active user" do - headless = Headless.new - headless.start - - Capybara.current_driver = :selenium + need_javascript visit page_with_token('admin_trustedclient') find('#system-menu').click @@ -109,56 +95,49 @@ class UsersTest < ActionDispatch::IntegrationTest find('tr', text: 'zzzzz-tpzed-xurymjxw79nv3jz'). find('a', text: 'Show'). click + user_url = page.current_url # Setup user click_link 'Admin' assert page.has_text? 'As an admin, you can setup' - click_link 'Setup Active User' + click_link 'Setup shell account for Active User' - sleep(0.1) - - popup = page.driver.browser.window_handles.last - page.within_window popup do - assert has_text? 'Virtual Machine' - fill_in "repo_name", :with => "test_repo" + within '.modal-content' do + find 'label', text: 'Virtual Machine' click_button "Submit" - wait_for_ajax end + visit user_url assert page.has_text? 'modified_by_client_uuid' + click_link 'Advanced' click_link 'Metadata' - assert page.has_text? '(Repository: test_repo)' - assert !(page.has_text? '(VirtualMachine:)') + vm_links = all("a", text: "VirtualMachine:") + assert_equal(1, vm_links.size) + assert_equal("VirtualMachine: testvm2.shell", vm_links.first.text) # Click on Setup button again and this time also choose a VM click_link 'Admin' - click_link 'Setup Active User' + click_link 'Setup shell account for Active User' - sleep(0.1) - popup = page.driver.browser.window_handles.last - page.within_window popup do - fill_in "repo_name", :with => "second_test_repo" + within '.modal-content' do select("testvm.shell", :from => 'vm_uuid') + fill_in "groups", :with => "test group one, test-group-two" click_button "Submit" - wait_for_ajax end - assert page.has_text? 'modified_by_client_uuid' + visit user_url + find '#Attributes', text: 'modified_by_client_uuid' + click_link 'Advanced' click_link 'Metadata' - assert page.has_text? '(Repository: second_test_repo)' - assert page.has_text? '(VirtualMachine: testvm.shell)' - - headless.stop + assert page.has_text? 'VirtualMachine: testvm.shell' + assert page.has_text? '["test group one", "test-group-two"]' end test "unsetup active user" do - headless = Headless.new - headless.start - - Capybara.current_driver = :selenium + need_javascript visit page_with_token('admin_trustedclient') @@ -169,6 +148,7 @@ class UsersTest < ActionDispatch::IntegrationTest find('tr', text: 'zzzzz-tpzed-xurymjxw79nv3jz'). find('a', text: 'Show'). click + user_url = page.current_url # Verify that is_active is set find('a,button', text: 'Attributes').click @@ -184,10 +164,15 @@ class UsersTest < ActionDispatch::IntegrationTest # unsetup user and verify all the above links are deleted click_link 'Admin' click_button 'Deactivate Active User' - sleep(0.1) + + if Capybara.current_driver == :selenium + sleep(0.1) + page.driver.browser.switch_to.alert.accept + else + # poltergeist returns true for confirm(), so we don't need to accept. + end # Should now be back in the Attributes tab for the user - page.driver.browser.switch_to.alert.accept assert page.has_text? 'modified_by_user_uuid' page.within(:xpath, '//span[@data-name="is_active"]') do assert_equal "false", text, "Expected user's is_active to be false after unsetup" @@ -195,31 +180,44 @@ class UsersTest < ActionDispatch::IntegrationTest click_link 'Advanced' click_link 'Metadata' - assert !(page.has_text? '(Repository: test_repo)') - assert !(page.has_text? '(Repository: second_test_repo)') - assert !(page.has_text? '(VirtualMachine: testvm.shell)') + assert page.has_no_text? 'VirtualMachine: testvm.shell' # setup user again and verify links present click_link 'Admin' - click_link 'Setup Active User' + click_link 'Setup shell account for Active User' - sleep(0.1) - popup = page.driver.browser.window_handles.last - page.within_window popup do - fill_in "repo_name", :with => "second_test_repo" + within '.modal-content' do select("testvm.shell", :from => 'vm_uuid') click_button "Submit" - wait_for_ajax end + visit user_url assert page.has_text? 'modified_by_client_uuid' click_link 'Advanced' click_link 'Metadata' - assert page.has_text? '(Repository: second_test_repo)' - assert page.has_text? '(VirtualMachine: testvm.shell)' - - headless.stop + assert page.has_text? 'VirtualMachine: testvm.shell' end + test "test add group button" do + need_javascript + + user_url = "/users/#{api_fixture('users')['active']['uuid']}" + visit page_with_token('admin_trustedclient', user_url) + + # Setup user + click_link 'Admin' + assert page.has_text? 'As an admin, you can setup' + + click_link 'Add new group' + + within '.modal-content' do + fill_in "group_name_input", :with => "test-group-added-in-modal" + click_button "Create" + end + wait_for_ajax + + # Back in the user "Admin" tab + assert page.has_text? 'test-group-added-in-modal' + end end