[ARVADOS] updated: 9d7efc36748d8b83af3d5dbdcd5326834fb317ff

[git at public.curoverse.com]

Summary of changes:
 .../test/integration/pipeline_instances_test.rb    | 75 +++++++++++++---------
 1 file changed, 45 insertions(+), 30 deletions(-)

       via  9d7efc36748d8b83af3d5dbdcd5326834fb317ff (commit)
      from  7bd04ed26901e34e3e5788093bee12be4406dd7b (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 9d7efc36748d8b83af3d5dbdcd5326834fb317ff
Author: Phil Hodgson <bitbucket at philhodgson.net>
Date:   Wed Nov 19 10:15:45 2014 +0100

    3382: test that after editing that an input is editable a second time
      - reverted from commit 7bd04ed26901e34e3e5788093bee12be4406dd7b and then adjusted according to latest code review

diff --git a/apps/workbench/test/integration/pipeline_instances_test.rb b/apps/workbench/test/integration/pipeline_instances_test.rb
index a62f787..a055972 100644
--- a/apps/workbench/test/integration/pipeline_instances_test.rb
+++ b/apps/workbench/test/integration/pipeline_instances_test.rb
@@ -63,6 +63,26 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
     end
     wait_for_ajax
 
+    # The input, after being specified, should still be displayed (#3382)
+    assert find('div.form-group', text: 'Foo/bar pair')
+
+    # The input, after being specified, should still be editable (#3382)
+    find('div.form-group', text: 'Foo/bar pair').
+      find('.btn', text: 'Choose').
+      click
+
+    within('.modal-dialog') do
+      assert(has_text?("Foo/bar pair"),
+             "pipeline input picker missing name of input")
+      wait_for_ajax
+      first('span', text: 'foo_tag').click
+      find('button', text: 'OK').click
+    end
+    wait_for_ajax
+
+    # For good measure, check one last time that the input, after being specified twice, is still be displayed (#3382)
+    assert find('div.form-group', text: 'Foo/bar pair')
+
     # Ensure that the collection's portable_data_hash, uuid and name
     # are saved in the desired places. (#4015)
 
@@ -276,33 +296,6 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
 
   # Create and run a pipeline for 'Two Part Pipeline Template' in 'A Project'
   def create_and_run_pipeline_in_aproject in_aproject, template_name, choose_file
-
-    def check_input_inedible(in_aproject, choose_file)
-      find('div.form-group', text: 'Foo/bar pair').
-        find('.btn', text: 'Choose').
-        click
-
-      within('.modal-dialog') do
-        if in_aproject
-          assert_selector 'button.dropdown-toggle', text: 'A Project'
-          wait_for_ajax
-        else
-          assert_selector 'button.dropdown-toggle', text: 'Home'
-          wait_for_ajax
-          click_button "Home"
-          click_link "A Project"
-          wait_for_ajax
-        end
-        first('span', text: 'foo_tag').click
-        if choose_file
-          wait_for_ajax
-          find('.preview-selectable', text: 'foo').click
-        end
-        find('button', text: 'OK').click
-      end
-      wait_for_ajax
-    end
-
     # create a pipeline instance
     find('.btn', text: 'Run a pipeline').click
     within('.modal-dialog') do
@@ -311,11 +304,33 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
     end
 
     assert find('p', text: 'Provide a value')
-    check_input_inedible in_aproject, choose_file
 
-    # The input, after being specified, should still be displayed and still be editable afterwards (#3382)
+    find('div.form-group', text: 'Foo/bar pair').
+      find('.btn', text: 'Choose').
+      click
+
+    within('.modal-dialog') do
+      if in_aproject
+        assert_selector 'button.dropdown-toggle', text: 'A Project'
+        wait_for_ajax
+      else
+        assert_selector 'button.dropdown-toggle', text: 'Home'
+        wait_for_ajax
+        click_button "Home"
+        click_link "A Project"
+        wait_for_ajax
+      end
+      first('span', text: 'foo_tag').click
+      if choose_file
+        wait_for_ajax
+        find('.preview-selectable', text: 'foo').click
+      end
+      find('button', text: 'OK').click
+    end
+    wait_for_ajax
+
+    # The input, after being specified, should still be displayed (#3382)
     assert find('div.form-group', text: 'Foo/bar pair')
-    check_input_inedible in_aproject, choose_file
 
     # Ensure that the collection's portable_data_hash, uuid and name
     # are saved in the desired places. (#4015)

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


hooks/post-receive
--