Merge pull request #653 from common-workflow-language/fix/concat-vf

Fix wrong evaluation of two concatenated expressions in valueFrom

Author: Anton Khodak

cwltool/expression.py

@@ -185,7 +185,7 @@ def interpolate(scan, rootvars,
             e = evaluator(scan[w[0] + 1:w[1]], jslib, rootvars, fullJS=fullJS,
                           timeout=timeout, force_docker_pull=force_docker_pull,
                           debug=debug, js_console=js_console)
-            if w[0] == 0 and w[1] == len(scan):
+            if w[0] == 0 and w[1] == len(scan) and len(parts) <= 1:
                 return e
             leaf = json.dumps(e, sort_keys=True)
             if leaf[0] == '"':

tests/test_js_sandbox.py

@@ -1,10 +1,15 @@
 from __future__ import absolute_import
+
 import unittest
 
+from mock import Mock
+
+import cwltool
+import cwltool.factory
 # we should modify the subprocess imported from cwltool.sandboxjs
 from cwltool.sandboxjs import (check_js_threshold_version,
-                               minimum_node_version_str, subprocess)
-from mock import Mock, patch
+                               subprocess)
+from tests.util import get_data
 
 
 class Javascript_Sanity_Checks(unittest.TestCase):
@@ -33,3 +38,11 @@ def test_node_version(self):
 
     def test_is_javascript_installed(self):
             pass
+
+
+class TestValueFrom(unittest.TestCase):
+
+    def test_value_from_two_concatenated_expressions(self):
+        f = cwltool.factory.Factory()
+        echo = f.make(get_data("tests/wf/vf-concat.cwl"))
+        self.assertEqual(echo(), {u"out": u"a sting\n"})

tests/wf/vf-concat.cwl

@@ -0,0 +1,19 @@
+cwlVersion: v1.0
+class: CommandLineTool
+requirements:
+  - class: InlineJavascriptRequirement
+
+baseCommand: echo
+inputs:
+  - id: parameter
+    type: string?
+    inputBinding:
+      valueFrom: $("a ")$("sting")
+outputs:
+  out:
+    type: string
+    outputBinding:
+      glob: output.txt
+      loadContents: true
+      outputEval: $(self[0].contents)
+stdout: output.txt