3781: Fix test that assumes only one empty collection is readable.

Wait longer for browser timeout in upload-fail test.

diff --git a/apps/workbench/test/integration/collection_upload_test.rb b/apps/workbench/test/integration/collection_upload_test.rb
index 1a3449ff37e7627fa623bc8b039265ac110b2f53..9a2637365cedc66ce3d20715d4c301c1cd2850a4 100644 (file)
--- a/apps/workbench/test/integration/collection_upload_test.rb
+++ b/apps/workbench/test/integration/collection_upload_test.rb
@@ -61,7 +61,9 @@ class CollectionUploadTest < ActionDispatch::IntegrationTest
     assert_selector 'button:not([disabled])', text: 'Start'
     click_button 'Start'
     if "test environment does not have a keepproxy yet, see #4534"
-      assert_text :visible, 'error'
+      using_wait_time 20 do
+        assert_text :visible, 'error'
+      end
     else
       assert_text :visible, 'Done!'
       visit sandbox_path+'.json'

diff --git a/apps/workbench/test/integration/collections_test.rb b/apps/workbench/test/integration/collections_test.rb
index a54d70ff2cc5677185cd4148dc47696eb851e859..201be6d77696671b022bca6cd44f0aa03e8dd9d3 100644 (file)
--- a/apps/workbench/test/integration/collections_test.rb
+++ b/apps/workbench/test/integration/collections_test.rb
@@ -107,7 +107,7 @@ class CollectionsTest < ActionDispatch::IntegrationTest
   test "can view empty collection" do
     uuid = 'd41d8cd98f00b204e9800998ecf8427e+0'
     visit page_with_token('active', "/collections/#{uuid}")
-    assert page.has_text?('This collection is empty')
+    assert page.has_text?(/This collection is empty|The following collections have this content/)
   end
 
   test "combine selected collections into new collection" do