Add test for submitting with legacy solution

Author: jdsutherland

cmd/submit_test.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"encoding/json"
 	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
@@ -9,6 +10,7 @@ import (
 	"testing"
 
 	"github.com/exercism/cli/config"
+	"github.com/exercism/cli/visibility"
 	"github.com/exercism/cli/workspace"
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
@@ -234,6 +236,34 @@ func TestSubmitOnlyEmptyFile(t *testing.T) {
 	assert.Regexp(t, "No files found", err.Error())
 }
 
+func TestSubmitExerciseWithLegacySolutionMetadataFile(t *testing.T) {
+	tmpDir, err := ioutil.TempDir("", "legacy-metadata-file")
+	assert.NoError(t, err)
+
+	dir := filepath.Join(tmpDir, "bogus-track", "bogus-exercise")
+	os.MkdirAll(dir, os.FileMode(0755))
+	writeFakeLegacySolution(t, dir, "bogus-track", "bogus-exercise")
+
+	file := filepath.Join(dir, "file.txt")
+	err = ioutil.WriteFile(file, []byte("This is a file."), os.FileMode(0755))
+	assert.NoError(t, err)
+
+	v := viper.New()
+	v.Set("token", "abc123")
+	v.Set("workspace", tmpDir)
+	cfg := config.Configuration{
+		Persister:       config.InMemoryPersister{},
+		Dir:             tmpDir,
+		UserViperConfig: v,
+	}
+	solutionRelPath := filepath.Join(workspace.IgnoreSubdir, workspace.SolutionFilename)
+	expectedSolutionPathAfterMigration := filepath.Join(dir, solutionRelPath)
+
+	_ = runSubmit(cfg, pflag.NewFlagSet("fake", pflag.PanicOnError), []string{file})
+	_, err = os.Stat(expectedSolutionPathAfterMigration)
+	assert.NoError(t, err)
+}
+
 func TestSubmitFilesFromDifferentSolutions(t *testing.T) {
 	tmpDir, err := ioutil.TempDir("", "dir-1-submit")
 	assert.NoError(t, err)
@@ -305,3 +335,25 @@ func writeFakeSolution(t *testing.T, dir, trackID, exerciseSlug string) {
 	err := solution.Write(dir)
 	assert.NoError(t, err)
 }
+
+func writeFakeLegacySolution(t *testing.T, dir, trackID, exerciseSlug string) {
+	solution := &workspace.Solution{
+		ID:          "bogus-solution-uuid",
+		Track:       trackID,
+		Exercise:    exerciseSlug,
+		URL:         "http://example.com/bogus-url",
+		IsRequester: true,
+	}
+	const legacySolutionName = ".solution.json"
+
+	b, err := json.Marshal(solution)
+	path := filepath.Join(dir, legacySolutionName)
+
+	// Hack because ioutil.WriteFile fails on hidden files
+	visibility.ShowFile(path)
+
+	err = ioutil.WriteFile(path, b, os.FileMode(0600))
+	solution.Dir = dir
+	err = visibility.HideFile(path)
+	assert.NoError(t, err)
+}

workspace/solution.go

@@ -13,10 +13,10 @@ import (
 	"github.com/exercism/cli/visibility"
 )
 
-const ignoreSubdir = ".exercism"
-const solutionFilename = "solution.json"
+const IgnoreSubdir = ".exercism"
+const SolutionFilename = "solution.json"
 
-var solutionRelPath = filepath.Join(ignoreSubdir, solutionFilename)
+var solutionRelPath = filepath.Join(IgnoreSubdir, SolutionFilename)
 
 // Solution contains metadata about a user's solution.
 type Solution struct {
@@ -71,7 +71,7 @@ func (s *Solution) Write(dir string) error {
 		return err
 	}
 
-	path := filepath.Join(dir, ignoreSubdir)
+	path := filepath.Join(dir, IgnoreSubdir)
 	if err := createIgnoreSubdir(path); err != nil {
 		return err
 	}
@@ -106,7 +106,7 @@ func createIgnoreSubdir(path string) error {
 }
 
 func migrateLegacySolutionFile(path string, legacySolutionPath string, solutionPath string) error {
-	if err := createIgnoreSubdir(filepath.Join(path, ignoreSubdir)); err != nil {
+	if err := createIgnoreSubdir(filepath.Join(path, IgnoreSubdir)); err != nil {
 		return err
 	}
 	if err := os.Rename(legacySolutionPath, solutionPath); err != nil {

workspace/workspace.go

@@ -186,7 +186,7 @@ func (ws Workspace) SolutionDir(s string) (string, error) {
 	path := s
 	for {
 		if path == ws.Dir {
-			return "", fmt.Errorf("couldn't find %s", solutionFilename)
+			return "", fmt.Errorf("couldn't find %s", SolutionFilename)
 		}
 		if _, err := os.Lstat(path); os.IsNotExist(err) {
 			return "", err
@@ -202,13 +202,10 @@ func checkSolutionFile(path string) error {
 	legacySolutionPath := filepath.Join(path, ".solution.json")
 	solutionPath := filepath.Join(path, solutionRelPath)
 
-	if _, legacyErr := os.Lstat(legacySolutionPath); legacyErr == nil {
+	if _, err := os.Lstat(legacySolutionPath); err == nil {
 		return migrateLegacySolutionFile(path, legacySolutionPath, solutionPath)
 	} else if _, err := os.Lstat(solutionPath); err != nil {
 		return err
-	} else if legacyErr != nil && err == nil {
-		return nil
-	} else {
-		return legacyErr
 	}
+	return nil
 }