X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/6c2a704b7a2d721087976b2b8ec4f22cdaf44178..fc69579b197cb963209111620f0a908c7811e1db:/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 6df7ee3a61..838884edbf 100644
--- a/apps/workbench/test/integration/users_test.rb
+++ b/apps/workbench/test/integration/users_test.rb
@@ -1,21 +1,20 @@
 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
+    find('#system-menu').click
     click_link 'Users'
 
     # check active user attributes in the list page
@@ -24,10 +23,10 @@ class UsersTest < ActionDispatch::IntegrationTest
     end
 
     find('tr', text: 'zzzzz-tpzed-xurymjxw79nv3jz').
-      find('a,button', text: 'Show').
+      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
@@ -43,26 +42,23 @@ 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')
 
+    find('#system-menu').click
     click_link 'Users'
 
     assert page.has_text? 'zzzzz-tpzed-d9tiejq69daie8f'
 
     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"
+      fill_in "repo_name", :with => "newtestrepo"
       click_button "Submit"
+      wait_for_ajax
     end
 
     visit '/users'
@@ -70,14 +66,12 @@ 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
     find('tr', text: new_user_uuid).
-      find('a,button', text: 'Show').
+      find('a', text: 'Show').
       click
 
     assert page.has_text? 'modified_by_user_uuid'
@@ -85,26 +79,24 @@ 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? 'Repository: foo/newtestrepo'
+    assert !(page.has_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
     click_link 'Users'
 
     # click on active user
     find('tr', text: 'zzzzz-tpzed-xurymjxw79nv3jz').
-      find('a,button', text: 'Show').
+      find('a', text: 'Show').
       click
+    user_url = page.current_url
 
     # Setup user
     click_link 'Admin'
@@ -112,58 +104,56 @@ class UsersTest < ActionDispatch::IntegrationTest
 
     click_link 'Setup 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'
+      fill_in "repo_name", :with => "activetestrepo"
       click_button "Submit"
     end
 
-    sleep(1)
+    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:)')
+    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'
 
-    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
+      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"
     end
 
-    sleep(0.1)
-    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? 'Repository: active/activetestrepo2'
+    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')
 
+    find('#system-menu').click
     click_link 'Users'
 
     # click on active user
     find('tr', text: 'zzzzz-tpzed-xurymjxw79nv3jz').
-      find('a,button', text: 'Show').
+      find('a', text: 'Show').
       click
+    user_url = page.current_url
 
     # Verify that is_active is set
     find('a,button', text: 'Attributes').click
@@ -179,40 +169,78 @@ 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"
     end
 
+    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? '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'
 
-    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
+      fill_in "repo_name", :with => "activetestrepo"
       select("testvm.shell", :from => 'vm_uuid')
       click_button "Submit"
     end
 
-    sleep(0.1)
+    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? 'Repository: active/activetestrepo'
+    assert page.has_text? 'VirtualMachine: testvm.shell'
   end
 
+  [
+    ['admin', false],
+    ['active', true],
+  ].each do |username, expect_show_button|
+    test "login as #{username} and access show button #{expect_show_button}" do
+      need_javascript
+
+      user = api_fixture('users', username)
+
+      visit page_with_token(username, '/users')
+
+      if expect_show_button
+        within('tr', text: user['uuid']) do
+          assert_text user['email']
+          assert_selector 'a', text: 'Show'
+          find('a', text: 'Show').click
+        end
+        assert_selector 'a', 'Data collections'
+      else
+        # no 'Show' button in the admin user's own row
+        within('tr', text: user['uuid']) do
+          assert_text user['email']
+          assert_no_selector 'a', text: 'Show'
+        end
+
+        # but the admin user can access 'Show' button for other users
+        active_user = api_fixture('users', 'active')
+        within('tr', text: active_user['uuid']) do
+          assert_text active_user['email']
+          assert_selector 'a', text: 'Show'
+          find('a', text: 'Show').click
+          assert_selector 'a', 'Attributes'
+        end
+      end
+    end
+  end
 end