X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/2d4198a095e193102daa2710c6b2baba7be7c9ce..0e57453d2b637a3d105d4e3d67031f3915f9d302:/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 d57bdea72d..db670815d8 100644 --- a/apps/workbench/test/integration/users_test.rb +++ b/apps/workbench/test/integration/users_test.rb @@ -56,7 +56,6 @@ class UsersTest < ActionDispatch::IntegrationTest within '.modal-content' do find 'label', text: 'Virtual Machine' fill_in "email", :with => "foo@example.com" - fill_in "repo_name", :with => "newtestrepo" click_button "Submit" wait_for_ajax end @@ -81,7 +80,6 @@ class UsersTest < ActionDispatch::IntegrationTest click_link 'Advanced' click_link 'Metadata' - assert page.has_text? 'Repository: foo/newtestrepo' assert !(page.has_text? 'VirtualMachine:') end @@ -102,11 +100,10 @@ class UsersTest < ActionDispatch::IntegrationTest 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' within '.modal-content' do find 'label', text: 'Virtual Machine' - fill_in "repo_name", :with => "activetestrepo" click_button "Submit" end @@ -115,17 +112,15 @@ class UsersTest < ActionDispatch::IntegrationTest click_link 'Advanced' click_link 'Metadata' - assert page.has_text? 'Repository: active/activetestrepo' 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' within '.modal-content' do - fill_in "repo_name", :with => "activetestrepo2" select("testvm.shell", :from => 'vm_uuid') fill_in "groups", :with => "test group one, test-group-two" click_button "Submit" @@ -136,7 +131,6 @@ class UsersTest < ActionDispatch::IntegrationTest click_link 'Advanced' click_link 'Metadata' - assert page.has_text? 'Repository: active/activetestrepo2' assert page.has_text? 'VirtualMachine: testvm.shell' assert page.has_text? '["test group one", "test-group-two"]' end @@ -185,15 +179,13 @@ class UsersTest < ActionDispatch::IntegrationTest click_link 'Advanced' click_link 'Metadata' - assert page.has_no_text? 'Repository: active/' 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' within '.modal-content' do - fill_in "repo_name", :with => "activetestrepo" select("testvm.shell", :from => 'vm_uuid') click_button "Submit" end @@ -203,7 +195,6 @@ class UsersTest < ActionDispatch::IntegrationTest click_link 'Advanced' click_link 'Metadata' - assert page.has_text? 'Repository: active/activetestrepo' assert page.has_text? 'VirtualMachine: testvm.shell' end