Fix syntax error. Update tests to use InitialWorkDirRequirement

Author: Peter Amstutz

draft-4/CommandLineTool.yml

@@ -632,10 +632,11 @@ $graph:
     - name: entryname
       type: [string, Expression]
       jsonldPredicate:
-        "_id": cwl:entryname
+        _id: cwl:entryname
     - name: entry
       type: [string, Expression]
-        "_id": cwl:entry
+      jsonldPredicate:
+        _id: cwl:entry
 
 
 - name: InitialWorkDirRequirement

draft-4/draft-4/rename.cwl

@@ -3,9 +3,9 @@ cwlVersion: cwl:draft-4.dev3
 baseCommand: "true"
 requirements:
   CreateFileRequirement:
-    fileDef:
-      - filename: $(inputs.newname)
-        fileContent: $(inputs.srcfile)
+    listing:
+      - entryname: $(inputs.newname)
+        entry: $(inputs.srcfile)
 inputs:
   srcfile: File
   newname: string

draft-4/draft-4/search.cwl

@@ -7,10 +7,9 @@ $graph:
     - valueFrom: input.txt
       position: 1
   requirements:
-    - class: CreateFileRequirement
-      fileDef:
-        - filename: input.txt
-          fileContent: $(inputs.file)
+    - class: InitialWorkDirRequirement
+      listing:
+        input.txt: $(inputs.file)
     - class: InlineJavascriptRequirement
 
   inputs:

draft-4/draft-4/template-tool.cwl

@@ -9,9 +9,8 @@ requirements:
       - { $include: underscore.js }
       - "var t = function(s) { return _.template(s)({'inputs': inputs}); };"
   - class: CreateFileRequirement
-    fileDef:
-      - filename: foo.txt
-        fileContent: >
+    listing:
+      foo.txt: >
           $(t("The file is <%= inputs.file1.path.split('/').slice(-1)[0] %>\n"))
 inputs:
   - id: file1