Removing JavaScript from loop tests

common-workflow-language · Jan 4, 2023 · dc16d13 · dc16d13
1 parent e85d631
commit dc16d13
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 22 deletions.
diff --git a/tests/loop/add1.cwl b/tests/loop/add1.cwl
@@ -0,0 +1,13 @@
+class: CommandLineTool
+cwlVersion: v1.3.0-dev1
+baseCommand: ["echo"]
+arguments:
+  - valueFrom: "\$(($(inputs.i1)+1))"
+inputs:
+  i1: int
+outputs:
+  o1:
+    type: stdout
+    loadContent: true
+    outputBinding:
+      outputEval: $(self.content)
diff --git a/tests/loop/all-output-loop-no-iteration.cwl b/tests/loop/all-output-loop-no-iteration.cwl
@@ -1,8 +1,6 @@
 #!/usr/bin/env cwl-runner
 cwlVersion: v1.3.0-dev1
 class: Workflow
-requirements:
-  InlineJavascriptRequirement: {}
 inputs:
   i1: int
 outputs:
@@ -15,14 +13,7 @@ steps:
     loop:
       i1: o1
     outputMethod: all
-    run:
-      class: ExpressionTool
-      inputs:
-        i1: int
-      outputs:
-        o1: int
-      expression: >
-        ${return {'o1': inputs.i1 + 1};}
+    run: add1.cwl
     in:
       i1: i1
     out: [o1]
diff --git a/tests/loop/all-output-loop.cwl b/tests/loop/all-output-loop.cwl
@@ -1,8 +1,6 @@
 #!/usr/bin/env cwl-runner
 cwlVersion: v1.3.0-dev1
 class: Workflow
-requirements:
-  InlineJavascriptRequirement: {}
 inputs:
   i1: int
 outputs:
@@ -15,14 +13,7 @@ steps:
     loop:
       i1: o1
     outputMethod: all
-    run:
-      class: ExpressionTool
-      inputs:
-        i1: int
-      outputs:
-        o1: int
-      expression: >
-        ${return {'o1': inputs.i1 + 1};}
+    run: add1.cwl
     in:
       i1: i1
     out: [o1]
diff --git a/tests/loop/test-index.yaml b/tests/loop/test-index.yaml
@@ -48,15 +48,15 @@
   doc: "Test a loop case with outputMethod set to all"
   output:
     o1: [2, 3, 4, 5, 6, 7, 8, 9, 10]
-  tags: [ conditional, loop, inline_javascript, workflow ]
+  tags: [ conditional, loop, workflow ]
 
 - job: single-var-loop-job.yml
   tool: all-output-loop-no-iteration.cwl
   id: loop_with_all_output_method_no_iteration
   doc: "Test a loop case with outputMethod set to all and a false condition"
   output:
     o1: []
-  tags: [ conditional, loop, inline_javascript, workflow ]
+  tags: [ conditional, loop, workflow ]
 
 - job: two-vars-loop-job.yml
   tool: value-from-loop.cwl