diff --git a/.travis.yml b/.travis.yml index 9666866fdf..f09d5ae9e3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,7 @@ install: - composer install - php artisan env - mv -v .env.testing .env + - php artisan migrate --seed script: - phpunit --debug diff --git a/config/database.php b/config/database.php index 1f50345a38..3b823a1e0f 100644 --- a/config/database.php +++ b/config/database.php @@ -48,7 +48,7 @@ return [ 'sqlite' => [ 'driver' => 'sqlite', - 'database' => realpath(__DIR__ . '/../tests/_data/db.sqlite'), + 'database' => realpath(__DIR__ . '/../tests/database/db.sqlite'), 'prefix' => '', ], diff --git a/database/migrations/2015_02_27_210653_changes_for_v332.php b/database/migrations/2015_02_27_210653_changes_for_v332.php index 3621857c2f..41d651d0cc 100644 --- a/database/migrations/2015_02_27_210653_changes_for_v332.php +++ b/database/migrations/2015_02_27_210653_changes_for_v332.php @@ -18,14 +18,14 @@ class ChangesForV332 extends Migration { Schema::table( 'accounts', function (Blueprint $table) { - $table->boolean('encrypted'); + $table->boolean('encrypted')->default(0); } ); Schema::table( 'reminders', function (Blueprint $table) { - $table->text('metadata'); + $table->text('metadata')->nullable(); } ); diff --git a/tests/database/.gitignore b/tests/database/.gitignore new file mode 100644 index 0000000000..6a91a439ea --- /dev/null +++ b/tests/database/.gitignore @@ -0,0 +1 @@ +*.sqlite \ No newline at end of file