Tweak test stuff

Author: lbausch

.travis.yml

@@ -20,14 +20,14 @@ cache:
 before_install:
   - mysql -e "CREATE DATABASE IF NOT EXISTS testing;"
   - mysql -e "GRANT ALL ON testing.* to 'homestead'@'%' IDENTIFIED BY 'secret';"
-  - mysql --database testing < ci/sqlgrey.sql
+  - mysql --database testing < tests/fixtures/sqlgrey.sql
   - . $HOME/.nvm/nvm.sh
   - nvm install stable
   - nvm use stable
   - npm install -g yarn
 
 install:
-  - cp -nv ci/.env.testing .env
+  - cp -nv tests/fixtures/.env.testing .env
   - composer install --no-interaction
   - php artisan key:generate
   - php artisan migrate --force

ci/test.sh

@@ -4,10 +4,10 @@ cd $(cd -P -- "$(dirname -- "$0")" && pwd -P)
 
 . util.sh
 
-create_database
-
 cd ..
 
+create_database
+
 copy_configuration
 
 configure_application

ci/test_dusk.sh

@@ -4,10 +4,10 @@ cd $(cd -P -- "$(dirname -- "$0")" && pwd -P)
 
 . util.sh
 
-create_database
-
 cd ..
 
+create_database
+
 copy_configuration
 
 configure_application

ci/util.sh

@@ -4,12 +4,12 @@ create_database() {
     mysql -uroot -e "DROP DATABASE IF EXISTS testing"
     mysql -uroot -e "CREATE DATABASE testing"
     mysql -uroot -e "GRANT ALL ON testing.* to 'homestead'@'%';"
-    mysql -uroot --database testing < sqlgrey.sql
+    mysql -uroot --database testing < tests/fixtures/sqlgrey.sql
 }
 
 copy_configuration() {
     cp -n .env .env.bak
-    cp -v ci/.env.testing .env
+    cp -v tests/fixtures/.env.testing .env
 }
 
 configure_application() {

circle.yml

@@ -13,7 +13,7 @@ database:
   override:
     - mysql -uubuntu -e "CREATE DATABASE IF NOT EXISTS testing;"
     - mysql -uubuntu -e "GRANT ALL ON testing.* to 'homestead'@'%' IDENTIFIED BY 'secret';"
-    - mysql -uubuntu --database testing < ci/sqlgrey.sql
+    - mysql -uubuntu --database testing < tests/fixtures/sqlgrey.sql
 
 general:
   artifacts:
@@ -29,7 +29,7 @@ test:
   pre:
     - "./vendor/laravel/dusk/bin/chromedriver-linux":
         background: true
-    - cp ci/.env.testing .env
+    - cp tests/fixtures/.env.testing .env
     - php artisan key:generate
     - php artisan migrate
     - php artisan passport:install