[ARVADOS] updated: b2607e91145c2286eb6379abb5d3108eae8f4b30

[git at public.curoverse.com]

Summary of changes:
 .../app/views/application/_svg_div.html.erb        |  4 +-
 .../test/integration/pipeline_instances_test.rb    | 52 ++++++++++++++++++++++
 2 files changed, 54 insertions(+), 2 deletions(-)

       via  b2607e91145c2286eb6379abb5d3108eae8f4b30 (commit)
       via  563f568124876cc8577baec11caf33e73466b975 (commit)
       via  b6199657cd6867b05ab191da01e04e15ad10cc7d (commit)
      from  3ddef17b8c4893a1a0ba17cd7c1fd02ae6a47cb8 (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 b2607e91145c2286eb6379abb5d3108eae8f4b30
Author: radhika <radhika at curoverse.com>
Date:   Sat Jun 7 08:52:45 2014 -0400

    2872: updates to the new test that creates and runs pipeline instance from within a folder.

diff --git a/apps/workbench/test/integration/pipeline_instances_test.rb b/apps/workbench/test/integration/pipeline_instances_test.rb
index 449c130..9a329f1 100644
--- a/apps/workbench/test/integration/pipeline_instances_test.rb
+++ b/apps/workbench/test/integration/pipeline_instances_test.rb
@@ -92,14 +92,12 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
     end
     find('#persistent-selection-count').click
 
-    # Add this collection to the folder
+    # Add this collection to the folder using collections menu from top nav
     visit '/folders'
     find('.arv-folder-list a,button', text: 'A Folder').click
-    find('.btn', text: 'Add data').click
-    find('span', text: 'foo_tag').click
-    within('.modal-dialog') do
-      find('.btn', text: 'Add').click
-    end
+
+    find('#collections-menu').click
+    click_button 'Copy selections into this folder'
 
     # create a pipeline instance
     find('.btn', text: 'Run a pipeline').click

commit 563f568124876cc8577baec11caf33e73466b975
Author: radhika <radhika at curoverse.com>
Date:   Sat Jun 7 08:41:55 2014 -0400

    2872: added a test that creates a pipeline instance from within a folder and runs it.

diff --git a/apps/workbench/test/integration/pipeline_instances_test.rb b/apps/workbench/test/integration/pipeline_instances_test.rb
index 4c100c2..449c130 100644
--- a/apps/workbench/test/integration/pipeline_instances_test.rb
+++ b/apps/workbench/test/integration/pipeline_instances_test.rb
@@ -23,6 +23,7 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
 
     instance_page = current_path
 
+    # put this pipeline instance in "A Folder"
     find('button', text: 'Choose a folder...').click
     within('.modal-dialog') do
       find('.selectable', text: 'A Folder').click
@@ -80,6 +81,59 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
     assert_not page.has_text? 'Graph'
   end
 
+  # Create a pipeline instance from within a folder and run
+  test 'Create pipeline inside a folder and run' do
+    visit page_with_token('active_trustedclient')
+
+    # Go over to the collections page and select something
+    visit '/collections'
+    within('tr', text: 'GNU_General_Public_License') do
+      find('input[type=checkbox]').click
+    end
+    find('#persistent-selection-count').click
+
+    # Add this collection to the folder
+    visit '/folders'
+    find('.arv-folder-list a,button', text: 'A Folder').click
+    find('.btn', text: 'Add data').click
+    find('span', text: 'foo_tag').click
+    within('.modal-dialog') do
+      find('.btn', text: 'Add').click
+    end
+
+    # create a pipeline instance
+    find('.btn', text: 'Run a pipeline').click
+    within('.modal-dialog') do
+      assert page.has_text? 'Two Part Pipeline Template'
+      find('.fa-gear').click
+      find('.btn', text: 'Next: choose inputs').click
+    end
+
+    assert find('p', text: 'Provide a value')
+
+    find('div.form-group', text: 'Foo/bar pair').
+      find('.btn', text: 'Choose').
+      click
+
+    within('.modal-dialog') do
+      find('span', text: 'foo_tag').click
+      find('button', text: 'OK').click
+    end
+
+    wait_for_ajax
+
+    # "Run" button present and enabled
+    page.assert_no_selector 'a.disabled,button.disabled', text: 'Run'
+    first('a,button', text: 'Run').click
+
+    # Pipeline is running. We have a "Stop" button instead now.
+    page.assert_no_selector 'a,button', text: 'Run'
+    page.assert_selector 'a,button', text: 'Stop'
+
+    # Since it is test env, no jobs are created to run. So, graph not visible
+    assert_not page.has_text? 'Graph'
+  end
+
   test 'view pipeline with job and see graph' do
     visit page_with_token('active_trustedclient')
 

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


hooks/post-receive
--