MigrationStatus.String() doesn't take an Exercise

nywilken · Sep 3, 2018 · 998b67c · 998b67c
1 parent c6bff35
commit 998b67c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/cmd/submit.go b/cmd/submit.go
@@ -130,7 +130,7 @@ func runSubmit(cfg config.Config, flags *pflag.FlagSet, args []string) error {
 		return err
 	}
 	if verbose, _ := flags.GetBool("verbose"); verbose {
-		fmt.Fprintf(os.Stderr, migrationStatus.String(exercise))
+		fmt.Fprintf(os.Stderr, migrationStatus.String())
 	}
 	solution, err := workspace.NewSolution(exerciseDir)
 	if err != nil {

diff --git a/workspace/exercise.go b/workspace/exercise.go
@@ -89,12 +89,12 @@ const (
 	MigrationStatusRemoved
 )
 
-func (m MigrationStatus) String(e Exercise) string {
+func (m MigrationStatus) String() string {
 	switch m {
 	case MigrationStatusMigrated:
-		return fmt.Sprintf("\nMigrated metadata to %s\n", e.MetadataFilepath())
+		return fmt.Sprintf("\nMigrated metadata\n")
 	case MigrationStatusRemoved:
-		return fmt.Sprintf("\nRemoved legacy metadata at %s\n", e.LegacyMetadataFilepath())
+		return fmt.Sprintf("\nRemoved legacy metadata\n")
 	default:
 		return ""
 	}

diff --git a/workspace/exercise_test.go b/workspace/exercise_test.go
@@ -70,14 +70,10 @@ func TestNewFromDir(t *testing.T) {
 }
 
 func TestMigrationStatusString(t *testing.T) {
-	exercise := Exercise{Root: "", Track: "bogus-track", Slug: "banana"}
-
-	assert.Equal(t, fmt.Sprintf("\nMigrated metadata to %s\n", exercise.MetadataFilepath()),
-		MigrationStatusMigrated.String(exercise))
-	assert.Equal(t, fmt.Sprintf("\nRemoved legacy metadata at %s\n", exercise.LegacyMetadataFilepath()),
-		MigrationStatusRemoved.String(exercise))
-	assert.Equal(t, "", MigrationStatusNoop.String(exercise))
-	assert.Equal(t, "", MigrationStatus(-1).String(exercise))
+	assert.Equal(t, fmt.Sprintf("\nMigrated metadata\n"), MigrationStatusMigrated.String())
+	assert.Equal(t, fmt.Sprintf("\nRemoved legacy metadata\n"), MigrationStatusRemoved.String())
+	assert.Equal(t, "", MigrationStatusNoop.String())
+	assert.Equal(t, "", MigrationStatus(-1).String())
 }
 
 func TestMigrateLegacyMetadataFileWithoutLegacy(t *testing.T) {