Merge branch 'development' into v0.15.0

buffalo/cmd/test.go

@@ -46,7 +46,9 @@ var testCmd = &cobra.Command{
 				return err
 			}
 
+			// Read and remove --force-migrations flag from args:
 			forceMigrations = strings.Contains(strings.Join(args, ""), "--force-migrations")
+			args = cutArg("--force-migrations", args)
 			if forceMigrations {
 				fm, err := pop.NewFileMigrator("./migrations", test)
 
@@ -216,3 +218,13 @@ func newTestCmd(args []string) *exec.Cmd {
 	cmd.Stderr = os.Stderr
 	return cmd
 }
+
+func cutArg(arg string, args []string) []string {
+	for i, v := range args {
+		if v == arg {
+			return append(args[:i], args[i+1:]...)
+		}
+	}
+
+	return args
+}

buffalo/cmd/test_test.go

@@ -0,0 +1,27 @@
+package cmd
+
+import (
+	"reflect"
+	"testing"
+)
+
+func Test_CutArg(t *testing.T) {
+	var tests = []struct {
+		arg      string
+		args     []string
+		expected []string
+	}{
+		{"b", []string{"a", "b", "c"}, []string{"a", "c"}},
+		{"--is-not-in-args", []string{"a", "b", "c"}, []string{"a", "b", "c"}},
+		{"--foo", []string{"--foo", "--bar", "--baz"}, []string{"--bar", "--baz"}},
+		{"--force-migrations", []string{"./actions/", "--force-migrations"}, []string{"./actions/"}},
+		{"--force-migrations", []string{"./actions/", "--force-migrations", "-m", "Test_HomeHandler"}, []string{"./actions/", "-m", "Test_HomeHandler"}},
+	}
+
+	for _, tt := range tests {
+		result := cutArg(tt.arg, tt.args)
+		if !reflect.DeepEqual(result, tt.expected) {
+			t.Errorf("got %s, want %s when cutting %s from %s", result, tt.expected, tt.arg, tt.args)
+		}
+	}
+}