[ARVADOS] updated: ed994d1e767c3017bcda18c1e2401ded86edcabb

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/test/integration/users_test.rb | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

       via  ed994d1e767c3017bcda18c1e2401ded86edcabb (commit)
       via  1ddbf7371a838cd8a8be50eb823f58796c46b2b9 (commit)
      from  589d2b599714a5e3c239aa25029f1a0a4261f520 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit ed994d1e767c3017bcda18c1e2401ded86edcabb
Merge: 589d2b5 1ddbf73
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Jul 21 14:52:35 2014 -0400

    Merge branch '3182-workbench-test-race'
    closes #3182


commit 1ddbf7371a838cd8a8be50eb823f58796c46b2b9
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Jul 21 14:50:10 2014 -0400

    3182: Fix races by using find() instead of {sleep; page.has_text?}.

diff --git a/apps/workbench/test/integration/users_test.rb b/apps/workbench/test/integration/users_test.rb
index dc3957c..b5bf241 100644
--- a/apps/workbench/test/integration/users_test.rb
+++ b/apps/workbench/test/integration/users_test.rb
@@ -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 at example.com"
       fill_in "repo_name", :with => "test_repo"
       click_button "Submit"
@@ -115,11 +113,8 @@ 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"
     end
@@ -135,15 +130,13 @@ class UsersTest < ActionDispatch::IntegrationTest
     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"
     end
 
-    assert page.has_text? 'modified_by_client_uuid'
+    find '#Attributes', text: 'modified_by_client_uuid'
 
     click_link 'Advanced'
     click_link 'Metadata'
@@ -187,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"
@@ -202,9 +196,7 @@ class UsersTest < ActionDispatch::IntegrationTest
     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"

-----------------------------------------------------------------------


hooks/post-receive
--