[ARVADOS] updated: 916a098440e4ad7900d297a5ee9914975d317177

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/assets/javascripts/pipeline_instances.js | 2 +-
 apps/workbench/app/controllers/application_controller.rb    | 4 +++-
 apps/workbench/app/helpers/application_helper.rb            | 4 +++-
 apps/workbench/test/integration/pipeline_instances_test.rb  | 8 +++-----
 4 files changed, 10 insertions(+), 8 deletions(-)

       via  916a098440e4ad7900d297a5ee9914975d317177 (commit)
       via  181b57c695c23d140a8a5b2f772515cc63248ceb (commit)
       via  38e59df2cbeac1cc58962eabdfad49942b32c8f6 (commit)
       via  4c05d2bb163576a2de9e063f840904a19363c104 (commit)
      from  899075bc7866666322677b0dfb0b12844a495425 (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 916a098440e4ad7900d297a5ee9914975d317177
Author: radhika <radhika at curoverse.com>
Date:   Fri Jun 6 14:41:42 2014 -0400

    2872: when a pipeline instance still needs input, the Run button should be disabled.

diff --git a/apps/workbench/test/integration/pipeline_instances_test.rb b/apps/workbench/test/integration/pipeline_instances_test.rb
index 84a4af8..42f6950 100644
--- a/apps/workbench/test/integration/pipeline_instances_test.rb
+++ b/apps/workbench/test/integration/pipeline_instances_test.rb
@@ -18,6 +18,9 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
       find('a,button', text: 'Run').click
     end
 
+    # This pipeline needs input. So, Run should be disabled
+    page.assert_selector 'a.disabled,button.disabled', text: 'Run'
+
     instance_page = current_path
 
     find('button', text: 'Choose a folder...').click
@@ -71,10 +74,5 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
     # Pipeline is stopped. It should now be in paused state.
     assert page.has_text? 'Paused'
     page.assert_selector 'a,button', text: 'Clone and edit'
-
-    # Go over to the graph tab
-#    click_link 'Advanced'
-#    click_link 'Graph'
-#    assert page.has_css? 'div#provenance_graph'
   end
 end

commit 181b57c695c23d140a8a5b2f772515cc63248ceb
Merge: 899075b 38e59df
Author: radhika <radhika at curoverse.com>
Date:   Fri Jun 6 14:32:02 2014 -0400

    Merge branch '2872-folder-nav' into 2872-folder-nav-tests


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


hooks/post-receive
--