[ARVADOS] updated: a894a61cc9004e184bc63f9f0a785f555d6c6829

[Git user]

Summary of changes:
 apps/workbench/test/helpers/share_object_helper.rb     |  8 +++++---
 .../test/integration/pipeline_instances_test.rb        |  8 ++++----
 apps/workbench/test/integration/users_test.rb          |  3 ++-
 apps/workbench/test/integration_helper.rb              | 18 +++++++++++++-----
 4 files changed, 24 insertions(+), 13 deletions(-)

       via  a894a61cc9004e184bc63f9f0a785f555d6c6829 (commit)
       via  30d4c3f8f1d4d303c66fc568b11c34be7c51f2a8 (commit)
       via  5905f1299f3a55519d1c79991e405ae8d47711f9 (commit)
       via  eabe4efe7b0964f537f2e09fb0d820272f1c86e7 (commit)
       via  986cdafd30a7bef4ccfbd18f808be52b2f6a458e (commit)
       via  bc67ce8d098c36e999739a9213b29bb72af6f23d (commit)
       via  1ce0bd54f40a686959e95e63f7aaa8b233269932 (commit)
       via  54cd184005d14ba93e93ae0eeb16ea70ee09a3b6 (commit)
      from  a605fc29fd7f79b2882625c99a72e998157fa5bc (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 a894a61cc9004e184bc63f9f0a785f555d6c6829
Merge: a605fc2 30d4c3f
Author: Tom Morris <tfmorris at curoverse.com>
Date:   Thu Oct 6 17:45:58 2016 -0400

    Merge branch '10077-workbench-integration-tests' closes #10077


commit 30d4c3f8f1d4d303c66fc568b11c34be7c51f2a8
Author: Tom Morris <tfmorris at curoverse.com>
Date:   Thu Oct 6 17:43:56 2016 -0400

    Add explanatory comment about FIXME

diff --git a/apps/workbench/test/integration_helper.rb b/apps/workbench/test/integration_helper.rb
index 424b666..3d92585 100644
--- a/apps/workbench/test/integration_helper.rb
+++ b/apps/workbench/test/integration_helper.rb
@@ -72,6 +72,12 @@ end
 
 module WaitForAjax
   # FIXME: Huge side effect here
+  # The following line changes the global default Capybara wait time, affecting
+  # every test which follows this one. This should be removed and the failing tests
+  # should have their individual wait times increased, if appropriate, using
+  # the using_wait_time(N) construct to temporarily change the wait time.
+  # Note: the below is especially bad because there are places that increase wait
+  # times using a multiplier e.g. using_wait_time(3 * Capybara.default_max_wait_time)
   Capybara.default_max_wait_time = 10
   def wait_for_ajax
     timeout = 10

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


hooks/post-receive
--