Issue #62 Cleans up the root directory

vierge-noire · Apr 25, 2021 · 4628554 · 4628554
1 parent 03a136e
commit 4628554
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,7 +4,7 @@ tmp/
 composer.lock
 **/test_fixture_factories
 .phpunit.result.cache
-.env
+tests/.env
 
 # These factories are baked by TestFixtureFactoryTaskTest
 /tests/TestApp/tests/Factory/*

diff --git a/run_tests.sh b/run_tests.sh
@@ -5,4 +5,4 @@ DRIVER=$1;
 echo "Starting PHPUNIT tests"
 export DB_DRIVER=$DRIVER
 
-./vendor/bin/phpunit
+./vendor/bin/phpunit
diff --git a/.env.Mysql → tests/.env.Mysql b/.env.Mysql → tests/.env.Mysql
diff --git a/.env.Postgres → tests/.env.Postgres b/.env.Postgres → tests/.env.Postgres
diff --git a/.env.Sqlite → tests/.env.Sqlite b/.env.Sqlite → tests/.env.Sqlite
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -112,15 +112,16 @@
     putenv('DB_DRIVER=Sqlite');
 }
 $driver =  getenv('DB_DRIVER');
+$testDir = ROOT . DS . 'tests' . DS;
 
-if (!file_exists(ROOT . DS . '.env')) {
-    @copy(".env.$driver", ROOT . DS . '.env');
+if (!file_exists("$testDir.env")) {
+    @copy("$testDir.env.$driver", "$testDir.env");
 }
 
 /**
  * Read .env file(s).
  */
-$loadEnv(ROOT . DS . '.env');
+$loadEnv("$testDir.env");
 
 // Re-read the driver
 $driver =  getenv('DB_DRIVER');