Merge pull request #26 from silinternational/feature/simplify-testing

Simplify testing

.gitignore

@@ -1,9 +1,10 @@
-nbproject/
-.DS_Store
-vendor/
-*.local.php
-build/
-.vagrant/
-.idea/
-composer.phar
-*.db
+nbproject/
+.DS_Store
+vendor/
+*.local.php
+build/
+.vagrant/
+.idea/
+composer.phar
+*.db
+.phpunit.result.cache

Makefile

@@ -1,18 +1,18 @@
-it-now: clean install phpunit
+it-now: clean install test
 
 clean:
-	sudo rm -rf ./vendor
-	rm -f composer.lock
+	docker-compose kill
+	docker system prune -f
 
 install:
-	docker-compose run --rm cli bash -c "cd /data;composer install"
+	docker-compose run --rm cli bash -c "composer install"
 
 update:
-	docker-compose run --rm cli bash -c "cd /data;composer update"
+	docker-compose run --rm cli bash -c "composer update"
 
-phpunit:
-	docker-compose run --rm cli bash -c "cd /data/SilMock/tests;./phpunit"
-
-# For use in virtualbox.
 test:
+	docker-compose run --rm cli bash -c "cd /data/SilMock/tests; ./phpunit"
+
+# For use in a Vagrant VM:
+vagrantTest:
 	cd /var/lib/GA_mock/SilMock/tests; /var/lib/GA_mock/SilMock/tests/phpunit

README.md

@@ -84,7 +84,7 @@ If not, then use vagrant up:
  - vagrant up
  - vagrant ssh
  - cd /var/lib/GA_mock
- - make test
+ - make vagrantTest
 
 Data Persistence
 ----------------