test(dsutil.FromFormFile): better test coverage

qri-io · Nov 4, 2018 · 4111ff7 · 4111ff7
1 parent b028aab
commit 4111ff7
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git a/dsutil/http.go b/dsutil/http.go
@@ -9,9 +9,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/qri-io/dataset/detect"
-
 	"github.com/qri-io/dataset"
+	"github.com/qri-io/dataset/detect"
 )
 
 // FormFileDataset extracts a dataset document from a http Request
@@ -48,7 +47,7 @@ func FormFileDataset(r *http.Request, dsp *dataset.DatasetPod) (err error) {
 		}
 	}
 
-	tfFile, _, err := r.FormFile("transform")
+	tfFile, tfHeader, err := r.FormFile("transform")
 	if err == http.ErrMissingFile {
 		err = nil
 	} else if err != nil {
@@ -65,9 +64,10 @@ func FormFileDataset(r *http.Request, dsp *dataset.DatasetPod) (err error) {
 		}
 		dsp.Transform.Syntax = "starlark"
 		dsp.Transform.ScriptBytes = tfData
+		dsp.Transform.ScriptPath = tfHeader.Filename
 	}
 
-	vizFile, _, err := r.FormFile("viz")
+	vizFile, vizHeader, err := r.FormFile("viz")
 	if err == http.ErrMissingFile {
 		err = nil
 	} else if err != nil {
@@ -84,6 +84,7 @@ func FormFileDataset(r *http.Request, dsp *dataset.DatasetPod) (err error) {
 		}
 		dsp.Viz.Format = "html"
 		dsp.Viz.ScriptBytes = vizData
+		dsp.Viz.ScriptPath = vizHeader.Filename
 	}
 
 	bodyfile, bodyHeader, err := r.FormFile("body")
@@ -100,6 +101,7 @@ func FormFileDataset(r *http.Request, dsp *dataset.DatasetPod) (err error) {
 		}
 		dsp.BodyPath = bodyHeader.Filename
 		dsp.BodyBytes = bodyData
+
 		if dsp.Structure == nil {
 			// TODO - this is silly and should move into base.PrepareDataset funcs
 			dsp.Structure = &dataset.StructurePod{}

diff --git a/dsutil/http_test.go b/dsutil/http_test.go
@@ -21,7 +21,18 @@ func TestFormFileDataset(t *testing.T) {
 	}
 
 	r = newFormFileRequest(t, map[string]string{
-		"file": testdataFile("../dstest/testdata/complete/input.dataset.json"),
+		"file":      testdataFile("../dstest/testdata/complete/input.dataset.json"),
+		"viz":       testdataFile("../dstest/testdata/complete/template.html"),
+		"transform": testdataFile("../dstest/testdata/complete/transform.star"),
+		"body":      testdataFile("../dstest/testdata/complete/body.csv"),
+	}, nil)
+	if err := FormFileDataset(r, dsp); err != nil {
+		t.Error(err)
+	}
+
+	r = newFormFileRequest(t, map[string]string{
+		"file": "testdata/dataset.yml",
+		"body": testdataFile("../dstest/testdata/complete/body.csv"),
 	}, nil)
 	if err := FormFileDataset(r, dsp); err != nil {
 		t.Error(err)

diff --git a/dsutil/testdata/dataset.yml b/dsutil/testdata/dataset.yml
@@ -0,0 +1,3 @@
+name: foobar
+meta:
+  title: this is a test