3836: minor update to test assertion

[arvados.git] / 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 b7bb49abc289118dcf02b21ebf0e3a56cd0e1fd9..b5bf2415c252eeca5b83db764e1a5d2cda65876d 100644 (file)
--- a/apps/workbench/test/integration/users_test.rb
+++ b/apps/workbench/test/integration/users_test.rb
@@ -25,10 +25,10 @@ class UsersTest < ActionDispatch::IntegrationTest
     end
 
     find('tr', text: 'zzzzz-tpzed-xurymjxw79nv3jz').
-      find('a[data-original-title=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
@@ -58,10 +58,8 @@ 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"
@@ -72,15 +70,13 @@ 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
+    new_user_uuid = 
+      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[data-original-title=show]').
+      find('a', text: 'Show').
       click
 
     assert page.has_text? 'modified_by_user_uuid'
@@ -88,9 +84,10 @@ 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:)')
+    assert page.has_text? 'Repository: test_repo'
+    assert !(page.has_text? 'VirtualMachine:')
 
     headless.stop
   end
@@ -107,7 +104,7 @@ class UsersTest < ActionDispatch::IntegrationTest
 
     # click on active user
     find('tr', text: 'zzzzz-tpzed-xurymjxw79nv3jz').
-      find('a[data-original-title=show]').
+      find('a', text: 'Show').
       click
 
     # Setup user
@@ -116,40 +113,35 @@ 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'
+    within '.modal-content' do
+      find 'label', text: 'Virtual Machine'
       fill_in "repo_name", :with => "test_repo"
       click_button "Submit"
-      wait_for_ajax
     end
 
     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: test_repo'
+    assert !(page.has_text? 'VirtualMachine:')
 
     # 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
+    within '.modal-content' do
       fill_in "repo_name", :with => "second_test_repo"
       select("testvm.shell", :from => 'vm_uuid')
       click_button "Submit"
-      wait_for_ajax
     end
 
-    assert page.has_text? 'modified_by_client_uuid'
+    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)'
+    assert page.has_text? 'Repository: second_test_repo'
+    assert page.has_text? 'VirtualMachine: testvm.shell'
 
     headless.stop
   end
@@ -167,7 +159,7 @@ class UsersTest < ActionDispatch::IntegrationTest
 
     # click on active user
     find('tr', text: 'zzzzz-tpzed-xurymjxw79nv3jz').
-      find('a[data-original-title=show]').
+      find('a', text: 'Show').
       click
 
     # Verify that is_active is set
@@ -188,6 +180,7 @@ class UsersTest < ActionDispatch::IntegrationTest
 
     # 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,29 +188,26 @@ 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_text? 'Repository: test_repo')
+    assert !(page.has_text? 'Repository: second_test_repo')
+    assert !(page.has_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
+    within '.modal-content' do
       fill_in "repo_name", :with => "second_test_repo"
       select("testvm.shell", :from => 'vm_uuid')
       click_button "Submit"
-      wait_for_ajax
     end
 
     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)'
+    assert page.has_text? 'Repository: second_test_repo'
+    assert page.has_text? 'VirtualMachine: testvm.shell'
 
     headless.stop
   end