Merge branch 'release' into project/DM

.gitlab-ci.yml

@@ -65,7 +65,7 @@ version_check:
   script:
     - GITTAG=$(git describe --tags)
     - CODEVERS=$(cat storage/version.go | grep "const SEMVER =" | cut -d ' ' -f4 | tr -d '"')
-    - if [[ $GITTAG != $CODEVERS ]]; then echo "VERSION NUMBER BAD $GITTAG != $CODEVER"; exit -1; fi
+    - if [[ $GITTAG != $CODEVERS ]]; then echo "VERSION NUMBER BAD $GITTAG != $CODEVERS"; exit -1; fi
 
 tag:
   stage: build

utils/convert.go

@@ -32,6 +32,10 @@ func CopyBytesToJS(src []byte) js.Value {
 
 // JsToJson converts the Javascript value to JSON.
 func JsToJson(value js.Value) string {
+	if value.IsUndefined() {
+		return "null"
+	}
+
 	return JSON.Call("stringify", value).String()
 }
 

utils/convert_test.go

@@ -113,6 +113,22 @@ func TestJsToJson(t *testing.T) {
 	}
 }
 
+// Tests that JsToJson return a null object when the Javascript object is
+// undefined.
+func TestJsToJson_Undefined(t *testing.T) {
+	expected, err := json.Marshal(nil)
+	if err != nil {
+		t.Errorf("Failed to JSON marshal test object: %+v", err)
+	}
+
+	jsJson := JsToJson(js.Undefined())
+
+	if string(expected) != jsJson {
+		t.Errorf("Recieved incorrect JSON from Javascript object."+
+			"\nexpected: %s\nreceived: %s", expected, jsJson)
+	}
+}
+
 // Tests that JsonToJS can convert a JSON object with multiple types to a
 // Javascript object and that all values match.
 func TestJsonToJS(t *testing.T) {