[ARVADOS] updated: 61fdce2ec17d5892642be7a957b824f9d311c192

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/test/diagnostics/pipeline_test.rb | 4 ++--
 apps/workbench/test/integration_helper.rb        | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

       via  61fdce2ec17d5892642be7a957b824f9d311c192 (commit)
       via  2fad64f0b0ef8085f3f8b59cdab31c37ea76c996 (commit)
      from  f0ac035f2eb76952ee2d56764756ddbc7bef270f (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 61fdce2ec17d5892642be7a957b824f9d311c192
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Jan 9 17:46:15 2015 -0500

    Add a magic pseudoclass to body, instead of appending a magic div. Selenium seems to like this better. refs #3021

diff --git a/apps/workbench/test/integration_helper.rb b/apps/workbench/test/integration_helper.rb
index 1a6a4f0..cb07725 100644
--- a/apps/workbench/test/integration_helper.rb
+++ b/apps/workbench/test/integration_helper.rb
@@ -29,15 +29,15 @@ module AssertDomEvent
   # Yield the supplied block, then wait for an event to arrive at a
   # DOM element.
   def assert_triggers_dom_event events, target='body'
-    magic = 'RXC0lObcVwEXwSvA-' + rand(2**20).to_s(36)
+    magic = 'received-dom-event-' + rand(2**30).to_s(36)
     page.evaluate_script <<eos
       $('#{target}').one('#{events}', function() {
-        $('body').append('<div id="#{magic}"></div>');
+        $('body').addClass('#{magic}');
       });
 eos
     yield
-    assert_selector "##{magic}"
-    page.evaluate_script "$('##{magic}').remove();";
+    assert_selector "body.#{magic}"
+    page.evaluate_script "$('body').removeClass('#{magic}');";
   end
 end
 

commit 2fad64f0b0ef8085f3f8b59cdab31c37ea76c996
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Jan 9 17:45:23 2015 -0500

    Diagnostics really do need selenium. refs #3021

diff --git a/apps/workbench/test/diagnostics/pipeline_test.rb b/apps/workbench/test/diagnostics/pipeline_test.rb
index 6c53809..eb9cfe5 100644
--- a/apps/workbench/test/diagnostics/pipeline_test.rb
+++ b/apps/workbench/test/diagnostics/pipeline_test.rb
@@ -4,11 +4,11 @@ class PipelineTest < DiagnosticsTest
   pipelines_to_test = Rails.configuration.pipelines_to_test.andand.keys
 
   setup do
-    need_javascript
+    need_selenium 'to make websockets work'
   end
 
   pipelines_to_test.andand.each do |pipeline_to_test|
-    test "visit home page for user #{pipeline_to_test}" do
+    test "run pipeline: #{pipeline_to_test}" do
       visit_page_with_token 'active'
       pipeline_config = Rails.configuration.pipelines_to_test[pipeline_to_test]
 

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


hooks/post-receive
--