Merge pull request #441 from Shopify/fixing_windows_tests

Fixing strict paths on windows

kit/asset_test.go

@@ -2,6 +2,7 @@ package kit
 
 import (
 	"encoding/base64"
+	"path/filepath"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -99,7 +100,7 @@ func TestLoadAssetsFromDirectory(t *testing.T) {
 	assets, err := loadAssetsFromDirectory(kittest.ProjectFiles[0], "", func(path string) bool { return false })
 	assert.Equal(t, "Path is not a directory", err.Error())
 	assets, err = loadAssetsFromDirectory(kittest.FixtureProjectPath, "", func(path string) bool {
-		return path != "assets/application.js"
+		return path != filepath.Join("assets","application.js")
 	})
 	assert.Nil(t, err)
 	assert.Equal(t, []Asset{{
@@ -121,7 +122,7 @@ func TestLoadAsset(t *testing.T) {
 	defer kittest.Cleanup()
 
 	asset, err := loadAsset(kittest.FixtureProjectPath, kittest.ProjectFiles[0])
-	assert.Equal(t, kittest.ProjectFiles[0], asset.Key)
+	assert.Equal(t, filepath.ToSlash(kittest.ProjectFiles[0]), asset.Key)
 	assert.Equal(t, true, asset.IsValid())
 	assert.Equal(t, "this is js content", asset.Value)
 	assert.Nil(t, err)

kit/environments.go

@@ -49,7 +49,7 @@ func searchConfigPath(configPath string) (string, string, error) {
 	name := filename[0 : len(filename)-len(filepath.Ext(filename))]
 	for _, ext := range supportedExts {
 		foundPath := filepath.Join(dir, name+"."+ext)
-		if _, err := os.Stat(foundPath); err == nil {
+		if _, err := os.Stat(foundPath); err == nil && "."+ext == filepath.Ext(filename) {
 			return foundPath, ext, nil
 		}
 	}

kit/path.go

@@ -25,7 +25,7 @@ func pathInProject(root, filename string) bool {
 func isProjectDirectory(root, filename string) bool {
 	filename = strings.TrimPrefix(
 		filepath.ToSlash(filepath.Clean(filename)),
-		filepath.Clean(root)+"/",
+		filepath.ToSlash(filepath.Clean(root)+"/"),
 	)
 
 	for _, dir := range assetLocations {
@@ -40,7 +40,7 @@ func isProjectDirectory(root, filename string) bool {
 func pathToProject(root, filename string) string {
 	filename = strings.TrimPrefix(
 		filepath.ToSlash(filepath.Clean(filename)),
-		filepath.Clean(root)+"/",
+		filepath.ToSlash(filepath.Clean(root)+"/"),
 	)
 
 	for _, dir := range assetLocations {

kit/version.go

@@ -14,7 +14,7 @@ import (
 
 var (
 	// ThemeKitVersion is the version build of the library
-	ThemeKitVersion, _ = version.NewVersion("0.7.1")
+	ThemeKitVersion, _ = version.NewVersion("0.7.2")
 	// ThemeKitReleasesURL is the url that fetches all versions of themekit used for.
 	// updating themekit. Change this for testing reasons.
 	ThemeKitReleasesURL = "https://shopify-themekit.s3.amazonaws.com/releases/all.json"