From 90729d2947bdd88512263952819fef2c529c3473 Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Tue, 18 May 2021 15:57:56 -0400 Subject: [PATCH] 17686: Add test when there's no 'default: []' Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- .../fixtures/workflow_with_array_fields.yaml | 6 ++--- .../workflow_with_default_array_fields.yaml | 26 +++++++++++++++++++ cypress/integration/favorites.spec.js | 9 ++++--- 3 files changed, 33 insertions(+), 8 deletions(-) create mode 100644 cypress/fixtures/workflow_with_default_array_fields.yaml diff --git a/cypress/fixtures/workflow_with_array_fields.yaml b/cypress/fixtures/workflow_with_array_fields.yaml index fc71cf86..33f03f6b 100644 --- a/cypress/fixtures/workflow_with_array_fields.yaml +++ b/cypress/fixtures/workflow_with_array_fields.yaml @@ -11,13 +11,11 @@ class: http://arvados.org/cwl#WorkflowRunnerResources id: "#main" inputs: - - default: [] - id: "#main/bar" + - id: "#main/bar" type: items: Directory type: array - - default: [] - id: "#main/foo" + - id: "#main/foo" type: items: File type: array diff --git a/cypress/fixtures/workflow_with_default_array_fields.yaml b/cypress/fixtures/workflow_with_default_array_fields.yaml new file mode 100644 index 00000000..fc71cf86 --- /dev/null +++ b/cypress/fixtures/workflow_with_default_array_fields.yaml @@ -0,0 +1,26 @@ +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: AGPL-3.0 + +--- +"$graph": +- class: Workflow + cwlVersion: v1.2 + hints: + - acrContainerImage: 7009415fdc959d0c2819ee2e9db96561+261 + class: http://arvados.org/cwl#WorkflowRunnerResources + id: "#main" + inputs: + - default: [] + id: "#main/bar" + type: + items: Directory + type: array + - default: [] + id: "#main/foo" + type: + items: File + type: array + outputs: [] + steps: [] +cwlVersion: v1.2 diff --git a/cypress/integration/favorites.spec.js b/cypress/integration/favorites.spec.js index 6750650d..c9151483 100644 --- a/cypress/integration/favorites.spec.js +++ b/cypress/integration/favorites.spec.js @@ -205,7 +205,8 @@ describe('Favorites tests', function () { }); }); - it('can select multi files when creating workflow', () => { + ['workflow_with_array_fields.yaml', 'workflow_with_default_array_fields.yaml'].forEach((yamlfile) => + it('can select multi files when creating workflow '+yamlfile, () => { cy.createProject({ owningUser: activeUser, projectName: 'myProject1', @@ -228,7 +229,7 @@ describe('Favorites tests', function () { cy.getAll('@myProject1', '@testCollection', '@testCollection2') .then(function ([myProject1, testCollection, testCollection2]) { - cy.readFile('cypress/fixtures/workflow_with_array_fields.yaml').then(workflow => { + cy.readFile('cypress/fixtures/'+yamlfile).then(workflow => { cy.createWorkflow(adminUser.token, { name: `TestWorkflow${Math.floor(Math.random() * 999999)}.cwl`, definition: workflow, @@ -300,5 +301,5 @@ describe('Favorites tests', function () { cy.contains(testCollection2.name); }); }); - }); -}); \ No newline at end of file + })); +}); -- 2.30.2