From cffe9566efaa838ada850353dd6e51ec4cc3ebff Mon Sep 17 00:00:00 2001 From: radhika Date: Thu, 6 Nov 2014 09:49:23 -0500 Subject: [PATCH] 3177: add tests for a template that uses dataclass = File --- .../integration/pipeline_instances_test.rb | 51 ++++++++++++------- .../api/test/fixtures/pipeline_templates.yml | 38 ++++++++++++++ 2 files changed, 71 insertions(+), 18 deletions(-) diff --git a/apps/workbench/test/integration/pipeline_instances_test.rb b/apps/workbench/test/integration/pipeline_instances_test.rb index f4860ffd7d..e2658ae84c 100644 --- a/apps/workbench/test/integration/pipeline_instances_test.rb +++ b/apps/workbench/test/integration/pipeline_instances_test.rb @@ -113,13 +113,13 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest wait_for_ajax end - create_and_run_pipeline_in_aproject true + create_and_run_pipeline_in_aproject true, 'Two Part Pipeline Template', false end # Create a pipeline instance from outside of a project test 'Run a pipeline from dashboard' do visit page_with_token('active_trustedclient') - create_and_run_pipeline_in_aproject false + create_and_run_pipeline_in_aproject false, 'Two Part Pipeline Template', false end test 'view pipeline with job and see graph' do @@ -201,25 +201,31 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest end [ - ['active', false, false, false], - ['active', false, false, true], - ['active', true, false, false], - ['active', true, true, false], - ['active', true, false, true], - ['active', true, true, true], - ['project_viewer', false, false, true], - ['project_viewer', true, false, true], - ['project_viewer', true, true, true], - ].each do |user, with_options, choose_options, in_aproject| - test "Rerun pipeline instance as #{user} using options #{with_options} #{choose_options} in #{in_aproject}" do + ['active', false, false, false, 'Two Part Pipeline Template', false], + ['active', false, false, true, 'Two Part Pipeline Template', false], + ['active', true, false, false, 'Two Part Pipeline Template', false], + ['active', true, true, false, 'Two Part Pipeline Template', false], + ['active', true, false, true, 'Two Part Pipeline Template', false], + ['active', true, true, true, 'Two Part Pipeline Template', false], + ['project_viewer', false, false, true, 'Two Part Pipeline Template', false], + ['project_viewer', true, false, true, 'Two Part Pipeline Template', false], + ['project_viewer', true, true, true, 'Two Part Pipeline Template', false], + ['active', false, false, false, 'Two Part Template with dataclass File', true], + ['active', false, false, true, 'Two Part Template with dataclass File', true], + ].each do |user, with_options, choose_options, in_aproject, template_name, choose_file| + test "Rerun pipeline instance as #{user} using options #{with_options} #{choose_options} + in #{in_aproject} with #{template_name} with file #{choose_file}" do visit page_with_token('active') + + # need bigger modal size when choosing a file from collection + Capybara.current_session.driver.browser.manage.window.resize_to(1024, 768) if in_aproject find("#projects-menu").click find('.dropdown-menu a,button', text: 'A Project').click end - create_and_run_pipeline_in_aproject in_aproject + create_and_run_pipeline_in_aproject in_aproject, template_name, choose_file instance_path = current_path # Pause the pipeline @@ -269,11 +275,11 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest end # Create and run a pipeline for 'Two Part Pipeline Template' in 'A Project' - def create_and_run_pipeline_in_aproject in_aproject + def create_and_run_pipeline_in_aproject in_aproject, template_name, choose_file # create a pipeline instance find('.btn', text: 'Run a pipeline').click within('.modal-dialog') do - find('.selectable', text: 'Two Part Pipeline Template').click + find('.selectable', text: template_name).click find('.btn', text: 'Next: choose inputs').click end @@ -295,6 +301,10 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest wait_for_ajax end first('span', text: 'foo_tag').click + if choose_file + wait_for_ajax + find('input[type=checkbox]').click + end find('button', text: 'OK').click end wait_for_ajax @@ -308,9 +318,14 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest click_link 'API response' api_response = JSON.parse(find('div#advanced_api_response pre').text) input_params = api_response['components']['part-one']['script_parameters']['input'] - assert_equal(input_params['value'], col['portable_data_hash'], "Not found expected input param value") - assert_equal(input_params['selection_name'], col['name'], "Not found expected input param name") assert_equal(input_params['selection_uuid'], col['uuid'], "Not found expected input param uuid") + if choose_file + assert_equal(input_params['value'], col['portable_data_hash']+'/foo', "Not found expected input file param value") + assert_equal(input_params['selection_name'], col['name']+'/foo', "Not found expected input file param name") + else + assert_equal(input_params['value'], col['portable_data_hash'], "Not found expected input param value") + assert_equal(input_params['selection_name'], col['name'], "Not found expected input param name") + end # "Run" button present and enabled page.assert_no_selector 'a.disabled,button.disabled', text: 'Run' diff --git a/services/api/test/fixtures/pipeline_templates.yml b/services/api/test/fixtures/pipeline_templates.yml index 11557e96d1..8579cf66a2 100644 --- a/services/api/test/fixtures/pipeline_templates.yml +++ b/services/api/test/fixtures/pipeline_templates.yml @@ -127,3 +127,41 @@ pipeline_template_in_fuse_project: title: "default input" description: "input collection" +template_with_dataclass_file: + uuid: zzzzz-p5p6p-k0xoa0ofxrystgw + owner_uuid: zzzzz-j7d0g-v955i6s2oi1cbso + created_at: 2014-04-14 12:35:04 -0400 + updated_at: 2014-04-14 12:35:04 -0400 + modified_at: 2014-04-14 12:35:04 -0400 + modified_by_client_uuid: zzzzz-ozdt8-brczlopd8u8d0jr + modified_by_user_uuid: zzzzz-tpzed-xurymjxw79nv3jz + name: Two Part Template with dataclass File + components: + part-one: + script: foo + script_version: master + script_parameters: + input: + required: true + dataclass: File + title: "Foo/bar pair" + description: "Provide an input file" + part-two: + script: bar + script_version: master + script_parameters: + input: + output_of: part-one + integer_with_default: + default: 123 + integer_with_value: + value: 123 + string_with_default: + default: baz + string_with_value: + value: baz + plain_string: qux + array_with_default: # important to test repeating values in the array! + default: [1,1,2,3,5] + array_with_value: # important to test repeating values in the array! + value: [1,1,2,3,5] -- 2.30.2