bug getodk#4: empty-string successor relevance values emitted () rele…

…vant.
issa-tseng · Feb 13, 2019 · f71c08b · f71c08b
1 parent 8287f56
commit f71c08b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 10 deletions.
diff --git a/lib/convert.js b/lib/convert.js
diff --git a/spec/src/convert-question-spec.ls b/spec/src/convert-question-spec.ls
@@ -262,6 +262,12 @@ describe 'followup question' ->
     expect(result.relevant).toBe("(selected(testquestion, 'testvalue'))")
     expect(context.successor-relevance).toBe(undefined)
 
+  test 'blank values are ignored' ->
+    context = new-context() with successor-relevance: ""
+    result = convert-question({ type: \inputText }, context)
+    expect(result.relevant).toBe(undefined)
+    expect(context.successor-relevance).toBe(undefined)
+
   test 'context is cleared at the end of group scope' ->
     context = new-context()
     convert-question({ type: \group, children: [{ type: \inputSelectOne, name: \test, other: [ \test ] }] }, context)

diff --git a/src/convert.ls b/src/convert.ls
@@ -122,7 +122,8 @@ convert-question = (question, context, prefix = []) ->
 
   ## merge in convenience relevant logic definitions:
   if (successor-relevance = delete context.successor-relevance)?
-    question.relevant = (question.relevant ? []) ++ [ successor-relevance ] |> map(-> "(#it)") |> (.join(' and '))
+    unless is-nonsense(successor-relevance)
+      question.relevant = (question.relevant ? []) ++ [ successor-relevance ] |> map(-> "(#it)") |> (.join(' and '))
 
   ## drop successor information into context:
   if (other = delete question.other)?