Move test data to testdata dir & remove unneeded Dockerfile (#452)

* Move test data to testdata dir & remove unneeded Dockerfile * Fix migration files location for CI tests
gobuffalo · Nov 1, 2019 · f8da582 · f8da582
1 parent b5e47d5
commit f8da582
Show file tree

Hide file tree

Showing 59 changed files with 11 additions and 19 deletions.
diff --git a/.gitignore b/.gitignore
@@ -28,7 +28,7 @@ bin/*
 gin-bin
 *.sqlite
 tsoda
-migrations/schema.sql
+testdata/migrations/schema.sql
 .grifter/
 vendor/
 go.mod

diff --git a/Dockerfile b/Dockerfile
diff --git a/azure-tests.yml b/azure-tests.yml
@@ -58,9 +58,9 @@ steps:
     workingDirectory: "$(modulePath)"          
     displayName: "Install soda"
   - script: |
-      $(GOBIN)/soda drop -e $(SODA_DIALECT)
-      $(GOBIN)/soda create -e $(SODA_DIALECT)
-      $(GOBIN)/soda migrate -e $(SODA_DIALECT)
+      $(GOBIN)/soda drop -e $(SODA_DIALECT) -p ./testdata/migrations
+      $(GOBIN)/soda create -e $(SODA_DIALECT) -p ./testdata/migrations
+      $(GOBIN)/soda migrate -e $(SODA_DIALECT) -p ./testdata/migrations
     workingDirectory: "$(modulePath)"         
     displayName: "Create DB & run migrations"
   - script: |

diff --git a/migration_box_test.go b/migration_box_test.go
@@ -13,7 +13,7 @@ func Test_MigrationBox(t *testing.T) {
 	}
 	r := require.New(t)
 
-	b, err := NewMigrationBox(packr.New("./migrations/multiple", "./migrations/multiple"), PDB)
+	b, err := NewMigrationBox(packr.New("./testdata/migrations/multiple", "./testdata/migrations/multiple"), PDB)
 	r.NoError(err)
 	r.Equal(4, len(b.Migrations["up"]))
 	r.Equal("mysql", b.Migrations["up"][0].DBType)

diff --git a/test.sh b/test.sh
@@ -49,9 +49,9 @@ function test {
   export SODA_DIALECT=$1
   echo ./tsoda -v
   echo "Setup..."
-  ./tsoda drop -e $SODA_DIALECT -c ./database.yml
-  ./tsoda create -e $SODA_DIALECT -c ./database.yml
-  ./tsoda migrate -e $SODA_DIALECT -c ./database.yml
+  ./tsoda drop -e $SODA_DIALECT -c ./database.yml -p ./testdata/migrations
+  ./tsoda create -e $SODA_DIALECT -c ./database.yml -p ./testdata/migrations
+  ./tsoda migrate -e $SODA_DIALECT -c ./database.yml -p ./testdata/migrations
   echo "Test..."
   go test -race -tags sqlite $VERBOSE ./... -count=1
 }
@@ -61,9 +61,9 @@ function debug_test {
     export SODA_DIALECT=$1
     echo ./tsoda -v
     echo "Setup..."
-    ./tsoda drop -e $SODA_DIALECT -c ./database.yml
-    ./tsoda create -e $SODA_DIALECT -c ./database.yml
-    ./tsoda migrate -e $SODA_DIALECT -c ./database.yml
+    ./tsoda drop -e $SODA_DIALECT -c ./database.yml -p ./testdata/migrations
+    ./tsoda create -e $SODA_DIALECT -c ./database.yml -p ./testdata/migrations
+    ./tsoda migrate -e $SODA_DIALECT -c ./database.yml -p ./testdata/migrations
     echo "Test and debug..."
     dlv test github.com/gobuffalo/pop
 }

diff --git a/migrations/20181104135255_users.down.fizz → ...migrations/20181104135255_users.down.fizz b/migrations/20181104135255_users.down.fizz → ...migrations/20181104135255_users.down.fizz
diff --git a/migrations/20181104135255_users.up.fizz → ...a/migrations/20181104135255_users.up.fizz b/migrations/20181104135255_users.up.fizz → ...a/migrations/20181104135255_users.up.fizz
diff --git a/...ons/20181104135526_good_friends.down.fizz → ...ons/20181104135526_good_friends.down.fizz b/...ons/20181104135526_good_friends.down.fizz → ...ons/20181104135526_good_friends.down.fizz
diff --git a/...tions/20181104135526_good_friends.up.fizz → ...tions/20181104135526_good_friends.up.fizz b/...tions/20181104135526_good_friends.up.fizz → ...tions/20181104135526_good_friends.up.fizz
diff --git a/...20181104135627_validatable_cars.down.fizz → ...20181104135627_validatable_cars.down.fizz b/...20181104135627_validatable_cars.down.fizz → ...20181104135627_validatable_cars.down.fizz
diff --git a/...s/20181104135627_validatable_cars.up.fizz → ...s/20181104135627_validatable_cars.up.fizz b/...s/20181104135627_validatable_cars.up.fizz → ...s/20181104135627_validatable_cars.up.fizz
diff --git a/...1104135710_not_validatable_cars.down.fizz → ...1104135710_not_validatable_cars.down.fizz b/...1104135710_not_validatable_cars.down.fizz → ...1104135710_not_validatable_cars.down.fizz
diff --git a/...181104135710_not_validatable_cars.up.fizz → ...181104135710_not_validatable_cars.up.fizz b/...181104135710_not_validatable_cars.up.fizz → ...181104135710_not_validatable_cars.up.fizz
diff --git a/.../20181104135800_callbacks_users.down.fizz → .../20181104135800_callbacks_users.down.fizz b/.../20181104135800_callbacks_users.down.fizz → .../20181104135800_callbacks_users.down.fizz
diff --git a/...ns/20181104135800_callbacks_users.up.fizz → ...ns/20181104135800_callbacks_users.up.fizz b/...ns/20181104135800_callbacks_users.up.fizz → ...ns/20181104135800_callbacks_users.up.fizz
diff --git a/migrations/20181104135829_books.down.fizz → ...migrations/20181104135829_books.down.fizz b/migrations/20181104135829_books.down.fizz → ...migrations/20181104135829_books.down.fizz
diff --git a/migrations/20181104135829_books.up.fizz → ...a/migrations/20181104135829_books.up.fizz b/migrations/20181104135829_books.up.fizz → ...a/migrations/20181104135829_books.up.fizz
diff --git a/migrations/20181104135856_taxis.down.fizz → ...migrations/20181104135856_taxis.down.fizz b/migrations/20181104135856_taxis.down.fizz → ...migrations/20181104135856_taxis.down.fizz
diff --git a/migrations/20181104135856_taxis.up.fizz → ...a/migrations/20181104135856_taxis.up.fizz b/migrations/20181104135856_taxis.up.fizz → ...a/migrations/20181104135856_taxis.up.fizz
diff --git a/.../20181104140000_user_attributes.down.fizz → .../20181104140000_user_attributes.down.fizz b/.../20181104140000_user_attributes.down.fizz → .../20181104140000_user_attributes.down.fizz
diff --git a/...ns/20181104140000_user_attributes.up.fizz → ...ns/20181104140000_user_attributes.up.fizz b/...ns/20181104140000_user_attributes.up.fizz → ...ns/20181104140000_user_attributes.up.fizz
diff --git a/migrations/20181104140055_songs.down.fizz → ...migrations/20181104140055_songs.down.fizz b/migrations/20181104140055_songs.down.fizz → ...migrations/20181104140055_songs.down.fizz
diff --git a/migrations/20181104140055_songs.up.fizz → ...a/migrations/20181104140055_songs.up.fizz b/migrations/20181104140055_songs.up.fizz → ...a/migrations/20181104140055_songs.up.fizz
diff --git a/...ations/20181104140142_composers.down.fizz → ...ations/20181104140142_composers.down.fizz b/...ations/20181104140142_composers.down.fizz → ...ations/20181104140142_composers.down.fizz
diff --git a/migrations/20181104140142_composers.up.fizz → ...grations/20181104140142_composers.up.fizz b/migrations/20181104140142_composers.up.fizz → ...grations/20181104140142_composers.up.fizz
diff --git a/migrations/20181104140221_writers.down.fizz → ...grations/20181104140221_writers.down.fizz b/migrations/20181104140221_writers.down.fizz → ...grations/20181104140221_writers.down.fizz
diff --git a/migrations/20181104140221_writers.up.fizz → ...migrations/20181104140221_writers.up.fizz b/migrations/20181104140221_writers.up.fizz → ...migrations/20181104140221_writers.up.fizz
diff --git a/...ations/20181104140340_addresses.down.fizz → ...ations/20181104140340_addresses.down.fizz b/...ations/20181104140340_addresses.down.fizz → ...ations/20181104140340_addresses.down.fizz
diff --git a/migrations/20181104140340_addresses.up.fizz → ...grations/20181104140340_addresses.up.fizz b/migrations/20181104140340_addresses.up.fizz → ...grations/20181104140340_addresses.up.fizz
diff --git a/.../20181104140431_users_addresses.down.fizz → .../20181104140431_users_addresses.down.fizz b/.../20181104140431_users_addresses.down.fizz → .../20181104140431_users_addresses.down.fizz
diff --git a/...ns/20181104140431_users_addresses.up.fizz → ...ns/20181104140431_users_addresses.up.fizz b/...ns/20181104140431_users_addresses.up.fizz → ...ns/20181104140431_users_addresses.up.fizz
diff --git a/migrations/20181104140522_courses.down.fizz → ...grations/20181104140522_courses.down.fizz b/migrations/20181104140522_courses.down.fizz → ...grations/20181104140522_courses.down.fizz
diff --git a/migrations/20181104140522_courses.up.fizz → ...migrations/20181104140522_courses.up.fizz b/migrations/20181104140522_courses.up.fizz → ...migrations/20181104140522_courses.up.fizz
diff --git a/...ons/20181104140606_course_codes.down.fizz → ...ons/20181104140606_course_codes.down.fizz b/...ons/20181104140606_course_codes.down.fizz → ...ons/20181104140606_course_codes.down.fizz
diff --git a/...tions/20181104140606_course_codes.up.fizz → ...tions/20181104140606_course_codes.up.fizz b/...tions/20181104140606_course_codes.up.fizz → ...tions/20181104140606_course_codes.up.fizz
diff --git a/migrations/20181104140650_labels.down.fizz → ...igrations/20181104140650_labels.down.fizz b/migrations/20181104140650_labels.down.fizz → ...igrations/20181104140650_labels.down.fizz
diff --git a/migrations/20181104140650_labels.up.fizz → .../migrations/20181104140650_labels.up.fizz b/migrations/20181104140650_labels.up.fizz → .../migrations/20181104140650_labels.up.fizz
diff --git a/migrations/20181104140743_cakes.down.fizz → ...migrations/20181104140743_cakes.down.fizz b/migrations/20181104140743_cakes.down.fizz → ...migrations/20181104140743_cakes.down.fizz
diff --git a/migrations/20181104140743_cakes.up.fizz → ...a/migrations/20181104140743_cakes.up.fizz b/migrations/20181104140743_cakes.up.fizz → ...a/migrations/20181104140743_cakes.up.fizz
diff --git a/...0181104140855_books_description.down.fizz → ...0181104140855_books_description.down.fizz b/...0181104140855_books_description.down.fizz → ...0181104140855_books_description.down.fizz
diff --git a/.../20181104140855_books_description.up.fizz → .../20181104140855_books_description.up.fizz b/.../20181104140855_books_description.up.fizz → .../20181104140855_books_description.up.fizz
diff --git a/...ations/20181104141346_single_id.down.fizz → ...ations/20181104141346_single_id.down.fizz b/...ations/20181104141346_single_id.down.fizz → ...ations/20181104141346_single_id.down.fizz
diff --git a/migrations/20181104141346_single_id.up.fizz → ...grations/20181104141346_single_id.up.fizz b/migrations/20181104141346_single_id.up.fizz → ...grations/20181104141346_single_id.up.fizz
diff --git a/migrations/20181106204926_body.down.fizz → .../migrations/20181106204926_body.down.fizz b/migrations/20181106204926_body.down.fizz → .../migrations/20181106204926_body.down.fizz
diff --git a/migrations/20181106204926_body.up.fizz → ...ta/migrations/20181106204926_body.up.fizz b/migrations/20181106204926_body.up.fizz → ...ta/migrations/20181106204926_body.up.fizz
diff --git a/migrations/20181106204930_head.down.fizz → .../migrations/20181106204930_head.down.fizz b/migrations/20181106204930_head.down.fizz → .../migrations/20181106204930_head.down.fizz
diff --git a/migrations/20181106204930_head.up.fizz → ...ta/migrations/20181106204930_head.up.fizz b/migrations/20181106204930_head.up.fizz → ...ta/migrations/20181106204930_head.up.fizz
diff --git a/migrations/20181130023854_head_ptr.down.fizz → ...rations/20181130023854_head_ptr.down.fizz b/migrations/20181130023854_head_ptr.down.fizz → ...rations/20181130023854_head_ptr.down.fizz
diff --git a/migrations/20181130023854_head_ptr.up.fizz → ...igrations/20181130023854_head_ptr.up.fizz b/migrations/20181130023854_head_ptr.up.fizz → ...igrations/20181130023854_head_ptr.up.fizz
diff --git a/migrations/20190219210052_students.down.fizz → ...rations/20190219210052_students.down.fizz b/migrations/20190219210052_students.down.fizz → ...rations/20190219210052_students.down.fizz
diff --git a/migrations/20190219210052_students.up.fizz → ...igrations/20190219210052_students.up.fizz b/migrations/20190219210052_students.up.fizz → ...igrations/20190219210052_students.up.fizz
diff --git a/migrations/20190219210059_parents.down.fizz → ...grations/20190219210059_parents.down.fizz b/migrations/20190219210059_parents.down.fizz → ...grations/20190219210059_parents.down.fizz
diff --git a/migrations/20190219210059_parents.up.fizz → ...migrations/20190219210059_parents.up.fizz b/migrations/20190219210059_parents.up.fizz → ...migrations/20190219210059_parents.up.fizz
diff --git a/...20190219211041_parents_students.down.fizz → ...20190219211041_parents_students.down.fizz b/...20190219211041_parents_students.down.fizz → ...20190219211041_parents_students.down.fizz
diff --git a/...s/20190219211041_parents_students.up.fizz → ...s/20190219211041_parents_students.up.fizz b/...s/20190219211041_parents_students.up.fizz → ...s/20190219211041_parents_students.up.fizz
diff --git a/.../20180413210602_create_users.mysql.up.sql → .../20180413210602_create_users.mysql.up.sql b/.../20180413210602_create_users.mysql.up.sql → .../20180413210602_create_users.mysql.up.sql
diff --git a/...180413210602_create_users.postgres.up.sql → ...180413210602_create_users.postgres.up.sql b/...180413210602_create_users.postgres.up.sql → ...180413210602_create_users.postgres.up.sql
diff --git a/...0180413210602_create_users.sqlite3.up.sql → ...0180413210602_create_users.sqlite3.up.sql b/...0180413210602_create_users.sqlite3.up.sql → ...0180413210602_create_users.sqlite3.up.sql
diff --git a/...ltiple/20180413210602_create_users.up.sql → ...ltiple/20180413210602_create_users.up.sql b/...ltiple/20180413210602_create_users.up.sql → ...ltiple/20180413210602_create_users.up.sql