[ARVADOS] updated: f0ac035f2eb76952ee2d56764756ddbc7bef270f

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/assets/javascripts/angular_shim.js | 9 +++++----
 apps/workbench/test/diagnostics/pipeline_test.rb      | 9 +++++++--
 2 files changed, 12 insertions(+), 6 deletions(-)

       via  f0ac035f2eb76952ee2d56764756ddbc7bef270f (commit)
       via  3636b3a3c941b89da720e6f6d02ac05c483ff097 (commit)
      from  15ffbb6dac07e594ca6b68022530ccfee97c2481 (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 f0ac035f2eb76952ee2d56764756ddbc7bef270f
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Jan 9 17:09:28 2015 -0500

    Make angular shim minify-safe. No issue #

diff --git a/apps/workbench/app/assets/javascripts/angular_shim.js b/apps/workbench/app/assets/javascripts/angular_shim.js
index 72729cd..8665c73 100644
--- a/apps/workbench/app/assets/javascripts/angular_shim.js
+++ b/apps/workbench/app/assets/javascripts/angular_shim.js
@@ -4,9 +4,10 @@
 
 $(document).on('arv:pane:loaded', function(event, $updatedElement) {
     if (angular && $updatedElement) {
-        angular.element($updatedElement).injector().invoke(function($compile) {
-            var scope = angular.element($updatedElement).scope();
-            $compile($updatedElement)(scope);
-        });
+        angular.element($updatedElement).injector().invoke([
+            '$compile', function($compile) {
+                var scope = angular.element($updatedElement).scope();
+                $compile($updatedElement)(scope);
+            }]);
     }
 });

commit 3636b3a3c941b89da720e6f6d02ac05c483ff097
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Jan 8 16:22:40 2015 -0500

    3021: Fix phantomjs races by waiting for pages to appear. refs #3021

diff --git a/apps/workbench/test/diagnostics/pipeline_test.rb b/apps/workbench/test/diagnostics/pipeline_test.rb
index 3a4ad64..6c53809 100644
--- a/apps/workbench/test/diagnostics/pipeline_test.rb
+++ b/apps/workbench/test/diagnostics/pipeline_test.rb
@@ -13,13 +13,16 @@ class PipelineTest < DiagnosticsTest
       pipeline_config = Rails.configuration.pipelines_to_test[pipeline_to_test]
 
       # Search for tutorial template
+      find '.navbar-fixed-top'
       within('.navbar-fixed-top') do
         page.find_field('search').set pipeline_config['template_uuid']
         page.find('.glyphicon-search').click
       end
 
       # Run the pipeline
-      find('a,button', text: 'Run').click
+      assert_triggers_dom_event 'shown.bs.modal' do
+        find('a,button', text: 'Run').click
+      end
 
       # Choose project
       within('.modal-dialog') do
@@ -61,7 +64,9 @@ class PipelineTest < DiagnosticsTest
       look_for_file = nil
     end
 
-    inputs_needed[0].click
+    assert_triggers_dom_event 'shown.bs.modal' do
+      inputs_needed[0].click
+    end
 
     within('.modal-dialog') do
       if look_for_uuid

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


hooks/post-receive
--