[ARVADOS] updated: 501ae28f1ed87af5f5d2b91546d8b973e1ee2a39

[git at public.curoverse.com]

Summary of changes:
 .../controllers/pipeline_instances_controller.rb   |  2 +-
 .../views/application/_show_object_button.html.erb |  6 +-
 .../pipeline_instances/_show_components.html.erb   | 67 +++++++++++-----------
 .../test/integration/pipeline_instances_test.rb    |  7 ++-
 4 files changed, 46 insertions(+), 36 deletions(-)

       via  501ae28f1ed87af5f5d2b91546d8b973e1ee2a39 (commit)
       via  9172dbabe4340fd2011d712c13e12c893b238ea6 (commit)
       via  f8de38896834cce639a183daf84c601cd77cc5ee (commit)
       via  ade9fc709137c19429ac93eed00550ce8335373e (commit)
       via  4f6e2f4b6b289ca7b2016543b425b6b5c2da10bd (commit)
       via  203a0d4f3efb008ae3af6ec8fbb7b99d8a5dc757 (commit)
       via  743e9c54b5a97ebd8c2119e6f5b2953987e22f4b (commit)
      from  916a098440e4ad7900d297a5ee9914975d317177 (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 501ae28f1ed87af5f5d2b91546d8b973e1ee2a39
Author: radhika <radhika at curoverse.com>
Date:   Fri Jun 6 18:25:25 2014 -0400

    2872: test now passing since the UI issue with "Resume" button is addressed.

diff --git a/apps/workbench/test/integration/pipeline_instances_test.rb b/apps/workbench/test/integration/pipeline_instances_test.rb
index a755b1f..c3ec3f5 100644
--- a/apps/workbench/test/integration/pipeline_instances_test.rb
+++ b/apps/workbench/test/integration/pipeline_instances_test.rb
@@ -67,17 +67,17 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
 
     first('a,button', text: 'Run').click
 
-    # Go over to the graph tab
-    click_link 'Provenance'
-    assert page.has_css? 'div#provenance_graph'
-
     # Pipeline is running. We have a "Stop" button instead now.
     page.assert_selector 'a,button', text: 'Stop'
     find('a,button', text: 'Stop').click
 
     # Pipeline is stopped. It should now be in paused state and Runnable again.
     assert page.has_text? 'Paused'
-    page.assert_no_selector 'a.disabled,button.disabled', text: 'Run'
+    page.assert_no_selector 'a.disabled,button.disabled', text: 'Resume'
     page.assert_selector 'a,button', text: 'Clone and edit'
+
+    # Since it is test env, no jobs are created to run. So, graph not visible
+    assert_not page.has_text? 'Graph'
   end
+
 end

commit 9172dbabe4340fd2011d712c13e12c893b238ea6
Merge: 4f6e2f4 f8de388
Author: radhika <radhika at curoverse.com>
Date:   Fri Jun 6 17:12:45 2014 -0400

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


commit 4f6e2f4b6b289ca7b2016543b425b6b5c2da10bd
Author: radhika <radhika at curoverse.com>
Date:   Fri Jun 6 15:53:12 2014 -0400

    2872: added graph and run button checks back. the test does not pass right now due to bug in graph tab display in pipeline instance display.

diff --git a/apps/workbench/test/integration/pipeline_instances_test.rb b/apps/workbench/test/integration/pipeline_instances_test.rb
index 42f6950..a755b1f 100644
--- a/apps/workbench/test/integration/pipeline_instances_test.rb
+++ b/apps/workbench/test/integration/pipeline_instances_test.rb
@@ -67,12 +67,17 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
 
     first('a,button', text: 'Run').click
 
+    # Go over to the graph tab
+    click_link 'Provenance'
+    assert page.has_css? 'div#provenance_graph'
+
     # Pipeline is running. We have a "Stop" button instead now.
     page.assert_selector 'a,button', text: 'Stop'
     find('a,button', text: 'Stop').click
 
-    # Pipeline is stopped. It should now be in paused state.
+    # Pipeline is stopped. It should now be in paused state and Runnable again.
     assert page.has_text? 'Paused'
+    page.assert_no_selector 'a.disabled,button.disabled', text: 'Run'
     page.assert_selector 'a,button', text: 'Clone and edit'
   end
 end

commit 203a0d4f3efb008ae3af6ec8fbb7b99d8a5dc757
Merge: 916a098 743e9c5
Author: radhika <radhika at curoverse.com>
Date:   Fri Jun 6 14:52:00 2014 -0400

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


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


hooks/post-receive
--