fix: go test no longer relies on environment variable

all_test.go

@@ -11,6 +11,8 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/matthewmueller/joy/internal/paths"
+
 	"github.com/sanity-io/litter"
 	"github.com/sergi/go-diff/diffmatchpatch"
 
@@ -44,10 +46,25 @@ func Test(t *testing.T) {
 		t.Fatal(e)
 	}
 
-	gosrc := path.Join(os.Getenv("GOPATH"), "src")
+	root, err := paths.Joy()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+exists:
+	chromePath, err := chrome.Exists(path.Join(root, "chrome"))
+	if err != nil {
+		t.Fatal(err)
+	} else if chromePath == "" {
+		log.Infof("downloading headless chrome (this only needs to be done once)")
+		if err := chrome.Download(path.Join(root, "chrome")); err != nil {
+			t.Fatal(err)
+		}
+		goto exists
+	}
 
 	ch, err := chrome.New(ctx, &chrome.Settings{
-		ExecutablePath: os.Getenv("GOLLY_CHROME_PATH"),
+		ExecutablePath: chromePath,
 		Stderr:         ioutil.Discard,
 		Stdout:         ioutil.Discard,
 	})
@@ -56,6 +73,8 @@ func Test(t *testing.T) {
 	}
 	defer ch.Close()
 
+	gosrc := path.Join(os.Getenv("GOPATH"), "src")
+
 	for _, dir := range dirs {
 		if !dir.IsDir() {
 			continue

internal/compiler/indexer/indexer.go

@@ -27,9 +27,14 @@ func New(program *loader.Program) (idx *index.Index, err error) {
 	}
 
 	for _, info := range program.AllPackages {
+		pkgpath := info.Pkg.Path()
 		// ignore the joy/macro package path when indexing
-		// TODO: is this going to work in every case?
-		if info.Pkg.Path() == "./macro" {
+		// TODO: this is a HUGE HACK and should be eliminated
+		// altogether. It shouldn't matter whether we include macro
+		// in the index, but right now index.DefinitionOf will return
+		// macro.File rather than the underlying type so rewrites
+		// currently get messed up
+		if pkgpath == "./macro" || strings.HasSuffix(pkgpath, "joy/macro") {
 			continue
 		}
 

internal/paths/paths.go

@@ -37,7 +37,7 @@ func Joy() (string, error) {
 	}
 
 	// short-circuit for testing
-	return getPath("joy")
+	// return getPath("joy")
 
 	root := path.Join(file, "..", "..", "..")
 	if _, err := os.Stat(root); !os.IsNotExist(err) {

macro/VERSION

@@ -0,0 +1 @@
+master

stdlib/VERSION

@@ -0,0 +1 @@
+master