Refactor tests

ICanBoogie · Feb 5, 2017 · 0b33278 · 0b33278
1 parent 1d13edb
commit 0b33278
Show file tree

Hide file tree

Showing 16 changed files with 51 additions and 31 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -18,12 +18,12 @@ matrix:
     - php: hhvm
 
 before_script:
-  - if [[ $TRAVIS_PHP_VERSION != "5.6" ]]; then COMPOSER_ROOT_VERSION=4.0 composer install --prefer-dist; fi
-  - if [[ $TRAVIS_PHP_VERSION = "5.6" ]]; then COMPOSER_ROOT_VERSION=4.0 composer require satooshi/php-coveralls --prefer-dist; fi
+  - if [[ $TRAVIS_PHP_VERSION != "5.6" ]]; then COMPOSER_ROOT_VERSION=4.0 composer install; fi
+  - if [[ $TRAVIS_PHP_VERSION = "5.6" ]]; then COMPOSER_ROOT_VERSION=4.0 composer require satooshi/php-coveralls; fi
 
 script:
   - mkdir -p build/logs
-  - phpunit --coverage-clover build/logs/clover.xml
+  - phpunit --coverage-clover ../build/logs/clover.xml
 
 after_success:
   - if [[ "$TRAVIS_PHP_VERSION" = "5.6" ]]; then php vendor/bin/coveralls -v; fi
diff --git a/Makefile b/Makefile
@@ -10,10 +10,10 @@ usage:
 	@echo "test:  Runs the test suite.\ndoc:   Creates the documentation.\nclean: Removes the documentation, the dependencies and the Composer files."
 
 vendor:
-	@$(COMPOSER_ENV) composer install --prefer-dist
+	@$(COMPOSER_ENV) composer install
 
 update:
-	@$(COMPOSER_ENV) composer update --prefer-dist
+	@$(COMPOSER_ENV) composer update
 
 autoload: vendor
 	@$(COMPOSER_ENV) composer dump-autoload
@@ -23,7 +23,7 @@ test: vendor
 
 test-coverage: vendor
 	@mkdir -p build/coverage
-	@phpunit --coverage-html build/coverage
+	@phpunit --coverage-html ../build/coverage
 
 doc: vendor
 	@mkdir -p build/docs

diff --git a/composer.json b/composer.json
@@ -20,6 +20,7 @@
 
 	"minimum-stability": "dev",
 	"prefer-stable": true,
+	"prefer-dist": true,
 
 	"require": {
 		"php": ">=5.6",
@@ -49,6 +50,14 @@
 		},
 		"classmap": [ "lib/Module.php" ]
 	},
+	"autoload-dev": {
+		"psr-4": {
+			"ICanBoogie\\": "tests/lib"
+		},
+		"classmap": [
+			"tests/Application.php"
+		]
+	},
 
 	"scripts": {
 		"post-autoload-dump": "ICanBoogie\\Autoconfig\\Hooks::on_autoload_dump"

diff --git a/tests/Application.php b/tests/Application.php
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ * This file is part of the ICanBoogie package.
+ *
+ * (c) Olivier Laviale <olivier.laviale@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace ICanBoogie;
+
+class Application extends Core
+{
+	use Module\ApplicationBindings;
+	use Binding\ActiveRecord\ApplicationBindings;
+}
diff --git a/tests/app/all/config/app.php b/tests/app/all/config/app.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace ICanBoogie;
+
+use ICanBoogie\Autoconfig\Autoconfig;
+
+return [
+
+	Autoconfig::MODULE_PATH => [
+
+		getcwd() . DIRECTORY_SEPARATOR . 'modules'
+
+	]
+
+];
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -11,12 +11,8 @@
 
 namespace ICanBoogie;
 
-use ICanBoogie\Autoconfig\Autoconfig;
-
 chdir(__DIR__);
 
-$_SERVER['DOCUMENT_ROOT'] = __DIR__;
-
 /* @var $autoload \Composer\Autoload\ClassLoader */
 
 $autoload = require __DIR__ . '/../vendor/autoload.php';
@@ -25,24 +21,4 @@
 $autoload->setPsr4('ICanBoogie\Module\ModulesTest\ModuleC\\', __DIR__ . '/modules/c/lib');
 $autoload->setPsr4('ICanBoogie\Module\ModulesTest\Sample\\', __DIR__ . '/modules/sample/lib');
 
-class Application extends Core
-{
-	use Module\ApplicationBindings;
-	use Binding\ActiveRecord\ApplicationBindings;
-}
-
-boot(array_merge_recursive(get_autoconfig(), [
-
-	Autoconfig::CONFIG_PATH => [
-
-		__DIR__ . '/../config' => Autoconfig::CONFIG_WEIGHT_APP
-
-	],
-
-	Autoconfig::MODULE_PATH => [
-
-		__DIR__ . DIRECTORY_SEPARATOR . 'modules'
-
-	]
-
-]));
+boot();
diff --git a/...dule/ForwardedOperationDispatcherTest.php → ...dule/ForwardedOperationDispatcherTest.php b/...dule/ForwardedOperationDispatcherTest.php → ...dule/ForwardedOperationDispatcherTest.php
diff --git a/tests/Module/HooksTest.php → tests/lib/Module/HooksTest.php b/tests/Module/HooksTest.php → tests/lib/Module/HooksTest.php
diff --git a/tests/Module/ModelCollectionTest.php → tests/lib/Module/ModelCollectionTest.php b/tests/Module/ModelCollectionTest.php → tests/lib/Module/ModelCollectionTest.php
diff --git a/...llection/InstallableModulesFilterTest.php → ...llection/InstallableModulesFilterTest.php b/...llection/InstallableModulesFilterTest.php → ...llection/InstallableModulesFilterTest.php
diff --git a/tests/Module/ModuleCollectionTest.php → tests/lib/Module/ModuleCollectionTest.php b/tests/Module/ModuleCollectionTest.php → tests/lib/Module/ModuleCollectionTest.php
diff --git a/...s/Module/ModuleConstructorMissingTest.php → ...b/Module/ModuleConstructorMissingTest.php b/...s/Module/ModuleConstructorMissingTest.php → ...b/Module/ModuleConstructorMissingTest.php
diff --git a/tests/Module/ModuleIsDisabledTest.php → tests/lib/Module/ModuleIsDisabledTest.php b/tests/Module/ModuleIsDisabledTest.php → tests/lib/Module/ModuleIsDisabledTest.php
diff --git a/tests/Module/ModuleNotDefinedTest.php → tests/lib/Module/ModuleNotDefinedTest.php b/tests/Module/ModuleNotDefinedTest.php → tests/lib/Module/ModuleNotDefinedTest.php
diff --git a/tests/ModuleTest.php → tests/lib/ModuleTest.php b/tests/ModuleTest.php → tests/lib/ModuleTest.php
diff --git a/tests/repository/.gitignore b/tests/repository/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore