[ARVADOS] updated: ace702f0c93a8a6e8b34c6a30a3dd7817c43d235

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/Gemfile.lock                                | 6 +++---
 apps/workbench/test/helpers/share_object_helper.rb         | 4 ++--
 apps/workbench/test/integration/collections_test.rb        | 2 +-
 apps/workbench/test/integration/pipeline_instances_test.rb | 4 ++--
 apps/workbench/test/integration_helper.rb                  | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

       via  ace702f0c93a8a6e8b34c6a30a3dd7817c43d235 (commit)
      from  72189590b0fc8555afaf54d7a27eb609b2e157d0 (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 ace702f0c93a8a6e8b34c6a30a3dd7817c43d235
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Nov 26 11:14:29 2015 -0500

    Update capybara in workbench bundle.
    
    No issue #

diff --git a/apps/workbench/Gemfile.lock b/apps/workbench/Gemfile.lock
index 8b2118c..303d583 100644
--- a/apps/workbench/Gemfile.lock
+++ b/apps/workbench/Gemfile.lock
@@ -68,7 +68,7 @@ GEM
       net-sftp (>= 2.0.0)
       net-ssh (>= 2.0.14)
       net-ssh-gateway (>= 1.1.0)
-    capybara (2.4.4)
+    capybara (2.5.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
@@ -132,7 +132,7 @@ GEM
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     metaclass (0.0.4)
-    mime-types (2.6.1)
+    mime-types (2.99)
     mini_portile (0.6.2)
     minitest (5.7.0)
     mocha (1.1.0)
@@ -148,7 +148,7 @@ GEM
     net-ssh (2.9.2)
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
-    nokogiri (1.6.5)
+    nokogiri (1.6.6.4)
       mini_portile (~> 0.6.0)
     oj (2.11.2)
     passenger (4.0.57)
diff --git a/apps/workbench/test/helpers/share_object_helper.rb b/apps/workbench/test/helpers/share_object_helper.rb
index 9d8f8d0..0d20aac 100644
--- a/apps/workbench/test/helpers/share_object_helper.rb
+++ b/apps/workbench/test/helpers/share_object_helper.rb
@@ -31,7 +31,7 @@ module ShareObjectHelper
       end
       click_on "Add"
     end
-    using_wait_time(Capybara.default_wait_time * 3) do
+    using_wait_time(Capybara.default_max_wait_time * 3) do
       assert(page.has_link?(name),
              "new share was not added to sharing table")
       assert_equal(start_share_count + 1, share_rows.size,
@@ -57,7 +57,7 @@ module ShareObjectHelper
       end
     end
     # Ensure revoked permission disappears from page.
-    using_wait_time(Capybara.default_wait_time * 3) do
+    using_wait_time(Capybara.default_max_wait_time * 3) do
       assert_no_text name
       assert_equal(start_rows.size - 1, share_rows.size,
                    "revoking share did not remove row from sharing table")
diff --git a/apps/workbench/test/integration/collections_test.rb b/apps/workbench/test/integration/collections_test.rb
index 4f66e9d..8190b35 100644
--- a/apps/workbench/test/integration/collections_test.rb
+++ b/apps/workbench/test/integration/collections_test.rb
@@ -31,7 +31,7 @@ class CollectionsTest < ActionDispatch::IntegrationTest
       text_assertion = :assert_text
       link_assertion = :refute_empty
     end
-    using_wait_time(Capybara.default_wait_time * 3) do
+    using_wait_time(Capybara.default_max_wait_time * 3) do
       send(text_assertion, "Shared at:")
     end
     send(link_assertion, all("a").select { |a| a[:href] =~ link_regexp })
diff --git a/apps/workbench/test/integration/pipeline_instances_test.rb b/apps/workbench/test/integration/pipeline_instances_test.rb
index b6bf700..8617c37 100644
--- a/apps/workbench/test/integration/pipeline_instances_test.rb
+++ b/apps/workbench/test/integration/pipeline_instances_test.rb
@@ -78,7 +78,7 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
       first('span', text: 'foo_tag').click
       find('.btn', text: 'Copy').click
     end
-    using_wait_time(Capybara.default_wait_time * 3) do
+    using_wait_time(Capybara.default_max_wait_time * 3) do
       wait_for_ajax
     end
 
@@ -166,7 +166,7 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
       first('span', text: 'foo_tag').click
       find('.btn', text: 'Copy').click
     end
-    using_wait_time(Capybara.default_wait_time * 3) do
+    using_wait_time(Capybara.default_max_wait_time * 3) do
       wait_for_ajax
     end
 
diff --git a/apps/workbench/test/integration_helper.rb b/apps/workbench/test/integration_helper.rb
index 1cda127..207ddd1 100644
--- a/apps/workbench/test/integration_helper.rb
+++ b/apps/workbench/test/integration_helper.rb
@@ -32,9 +32,9 @@ Capybara.register_driver :selenium_with_download do |app|
 end
 
 module WaitForAjax
-  Capybara.default_wait_time = 5
+  Capybara.default_max_wait_time = 5
   def wait_for_ajax
-    Timeout.timeout(Capybara.default_wait_time) do
+    Timeout.timeout(Capybara.default_max_wait_time) do
       loop until finished_all_ajax_requests?
     end
   end

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


hooks/post-receive
--