remove setupCtx from tests

wellington · Jan 18, 2016 · 2f222c7 · 2f222c7
1 parent 3bcc5bb
commit 2f222c7
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 61 deletions.
diff --git a/handlers/handlers_test.go b/handlers/handlers_test.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
+	"log"
 	"net/http"
 	"net/http/httptest"
 	"os"
@@ -403,18 +404,18 @@ div {
   background: sprite($map, "140");
 }`)
 
-	ctx := oldContext()
-
-	ctx.BuildDir = "../test/build"
-	ctx.GenImgDir = "../test/build/img"
-	ctx.ImageDir = "../test/img"
-	var out bytes.Buffer
-	err := ctx.Compile(in, &out)
+	comp, err := libsass.New(os.Stdout, in,
+		libsass.Payload(payload.New()),
+		libsass.ImgDir("../test/img"),
+		libsass.BuildDir("../test/build"),
+		libsass.ImgBuildDir("../test/build/img"),
+	)
 	if err != nil {
-		fmt.Println(err)
+		log.Fatal(err)
+	}
+	if err := comp.Run(); err != nil {
+		log.Fatal(err)
 	}
-
-	io.Copy(os.Stdout, &out)
 
 	// Output:
 	// div {
@@ -428,12 +429,8 @@ div {
   background: sprite($map, "140", 10px, 10px);
 }`)
 
-	ctx := oldContext()
-	ctx.BuildDir = "../test/build"
-	ctx.GenImgDir = "../test/build/img"
-	ctx.ImageDir = "../test/img"
 	var out bytes.Buffer
-	err := ctx.Compile(in, &out)
+	_, err := setupComp(t, in, &out)
 
 	if err != nil {
 		t.Fatal("expected error")
@@ -454,12 +451,8 @@ div {
   background: sprite($map, "140", 0, 0);
 }`)
 
-	ctx := oldContext()
-	ctx.BuildDir = "../test/build"
-	ctx.GenImgDir = "../test/build/img"
-	ctx.ImageDir = "../test/img"
 	var out bytes.Buffer
-	err := ctx.Compile(in, &out)
+	_, err := setupComp(t, in, &out)
 
 	e := `Error > stdin:4
 error in C function sprite: Please specify unit for offset ie. (2px)
@@ -490,18 +483,24 @@ div {
   background: sprite($map, "140");
 }`)
 
-	ctx := oldContext()
-	ctx.IncludePaths = []string{"../test"}
-	ctx.HTTPPath = "http://foo.com"
-	ctx.BuildDir = "../test/build"
-	ctx.GenImgDir = "../test/build/img"
-	ctx.ImageDir = "../test/img"
 	var out bytes.Buffer
-	err := ctx.Compile(in, &out)
-
+	comp, err := libsass.New(&out, in,
+		libsass.OutputStyle(libsass.NESTED_STYLE),
+		libsass.BuildDir("../test/build"),
+		libsass.ImgDir("../test/img"),
+		libsass.FontDir("../test/font"),
+		libsass.Payload(payload.New()),
+		libsass.ImgBuildDir("../test/build/img"),
+		libsass.HTTPPath("http://foo.com"),
+	)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
+
+	if err := comp.Run(); err != nil {
+		t.Fatal(err)
+	}
+
 	e := `div {
   background: url("http://foo.com/build/4f0c6e.png") 0px -149px; }
 `
@@ -523,14 +522,8 @@ div {
   background: sprite($map, "twitt");
 }`)
 
-	ctx := oldContext()
-
-	ctx.BuildDir = "../test/build"
-	ctx.GenImgDir = "../test/build/img"
-	ctx.ImageDir = "../test/img"
 	var out bytes.Buffer
-	err := ctx.Compile(in, &out)
-
+	_, err := setupComp(t, in, &out)
 	if err != nil {
 		t.Error(err)
 	}

diff --git a/handlers/spriting_test.go b/handlers/spriting_test.go
@@ -2,12 +2,12 @@ package handlers
 
 import (
 	"bytes"
-	"fmt"
-	"io"
+	"log"
 	"os"
 	"testing"
 
 	libsass "github.com/wellington/go-libsass"
+	"github.com/wellington/wellington/payload"
 )
 
 func ExampleSprite_position() {
@@ -21,17 +21,20 @@ div.retina {
   background-position: 10px ceil(nth(sprite-position($map, "140"), 2) /2 );
 }`)
 
-	ctx := oldContext()
-	ctx.BuildDir = "../test/build"
-	ctx.GenImgDir = "../test/build/img"
-	ctx.ImageDir = "../test/img"
-	var out bytes.Buffer
-	err := ctx.Compile(in, &out)
+	comp, err := libsass.New(os.Stdout, in,
+		libsass.Payload(payload.New()),
+		libsass.ImgDir("../test/img"),
+		libsass.BuildDir("../test/build"),
+		libsass.ImgBuildDir("../test/build/img"),
+	)
 	if err != nil {
-		fmt.Println(err)
+		log.Fatal(err)
 	}
 
-	io.Copy(os.Stdout, &out)
+	err = comp.Run()
+	if err != nil {
+		log.Fatal(err)
+	}
 
 	// Output:
 	// div {
@@ -42,6 +45,7 @@ div.retina {
 }
 
 func TestFuncSpriteFile(t *testing.T) {
+
 	ctx := oldContext()
 	ctx.BuildDir = "../test/build"
 	ctx.GenImgDir = "../test/build/img"
@@ -104,22 +108,17 @@ height: $aritymap;
 line-height: $paddedmap;
 }`)
 
-	ctx := oldContext()
-
-	ctx.BuildDir = "../test/build"
-	ctx.GenImgDir = "../test/build/img"
-	ctx.ImageDir = "../test/img"
 	var out bytes.Buffer
-	err := ctx.Compile(in, &out)
+	_, err := setupComp(t, in, &out)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
+
 	exp := `div {
   width: *.png0;
   height: *.png0;
   line-height: *.png1; }
 `
-
 	if exp != out.String() {
 		t.Errorf("got:\n%s\nwanted:\n%s", out.String(), exp)
 	}
@@ -131,17 +130,12 @@ div {
   content: $map;
 }`)
 
-	ctx := oldContext()
-
-	ctx.ImageDir = "../test/img"
-	ctx.BuildDir = "../test/build"
-	ctx.GenImgDir = "../test/build/img"
-
 	var out bytes.Buffer
-	err := ctx.Compile(in, &out)
+	_, err := setupComp(t, in, &out)
 	if err != nil {
 		t.Error(err)
 	}
+
 	exp := `div {
   content: *.png10; }
 `