diff --git a/.gitignore b/.gitignore index f69dfba9b..f443cb81e 100644 --- a/.gitignore +++ b/.gitignore @@ -6,5 +6,6 @@ parameters.yml *.sass-cache Resources/node_modules/ Tests/Fixtures/App/app/config/parameters.yml +/nbproject/private/ +Resources/test/Fixtures/App/bootstrap.php.cache -/nbproject/private/ \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 80ba9ab93..61fa78020 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,10 +4,10 @@ before_script: - if [ -z ${GITHUB_TOKEN+x} ]; then composer config github-oauth.github.com $GITHUB_TOKEN; fi - php -d memory_limit=-1 /usr/local/bin/composer install --no-interaction - - cp Tests/Fixtures/App/app/config/parameters.gitlab-ci.yml Tests/Fixtures/App/app/config/parameters.yml - - php Tests/Fixtures/App/app/console.php --env=test cache:warmup - - php Tests/Fixtures/App/app/console.php doctrine:migrations:migrate --env=test --no-interaction - - php Tests/Fixtures/App/app/console.php doctrine:fixtures:load --env=test --no-interaction + - cp Resources/test/Fixtures/App/app/config/parameters.gitlab-ci.yml Resources/test/Fixtures/App/app/config/parameters.yml + - php Resources/test/Fixtures/App/app/console.php --env=test cache:warmup + - php Resources/test/Fixtures/App/app/console.php doctrine:migrations:migrate --env=test --no-interaction + - php Resources/test/Fixtures/App/app/console.php doctrine:fixtures:load --env=test --no-interaction stages: - test diff --git a/Tests/Fixtures/App/app/AppKernel.php b/Resources/test/Fixtures/App/app/AppKernel.php similarity index 100% rename from Tests/Fixtures/App/app/AppKernel.php rename to Resources/test/Fixtures/App/app/AppKernel.php diff --git a/Tests/Fixtures/App/app/DoctrineMigrations/.gitignore b/Resources/test/Fixtures/App/app/DoctrineMigrations/.gitignore similarity index 100% rename from Tests/Fixtures/App/app/DoctrineMigrations/.gitignore rename to Resources/test/Fixtures/App/app/DoctrineMigrations/.gitignore diff --git a/Tests/Fixtures/App/app/Resources/views/base.html.twig b/Resources/test/Fixtures/App/app/Resources/views/base.html.twig similarity index 100% rename from Tests/Fixtures/App/app/Resources/views/base.html.twig rename to Resources/test/Fixtures/App/app/Resources/views/base.html.twig diff --git a/Tests/Fixtures/App/app/autoload.php b/Resources/test/Fixtures/App/app/autoload.php similarity index 64% rename from Tests/Fixtures/App/app/autoload.php rename to Resources/test/Fixtures/App/app/autoload.php index 57a507088..39dc0e2ba 100644 --- a/Tests/Fixtures/App/app/autoload.php +++ b/Resources/test/Fixtures/App/app/autoload.php @@ -3,10 +3,8 @@ use Doctrine\Common\Annotations\AnnotationRegistry; use Composer\Autoload\ClassLoader; -/** - * @var ClassLoader $loader - */ -$loader = require __DIR__.'/../../../../vendor/autoload.php'; +/** @var ClassLoader $loader */ +$loader = require __DIR__.'/../../../../../vendor/autoload.php'; AnnotationRegistry::registerLoader(array($loader, 'loadClass')); diff --git a/Tests/Fixtures/App/app/config/config.yml b/Resources/test/Fixtures/App/app/config/config.yml similarity index 100% rename from Tests/Fixtures/App/app/config/config.yml rename to Resources/test/Fixtures/App/app/config/config.yml diff --git a/Tests/Fixtures/App/app/config/config_dev.yml b/Resources/test/Fixtures/App/app/config/config_dev.yml similarity index 100% rename from Tests/Fixtures/App/app/config/config_dev.yml rename to Resources/test/Fixtures/App/app/config/config_dev.yml diff --git a/Tests/Fixtures/App/app/config/config_test.yml b/Resources/test/Fixtures/App/app/config/config_test.yml similarity index 100% rename from Tests/Fixtures/App/app/config/config_test.yml rename to Resources/test/Fixtures/App/app/config/config_test.yml diff --git a/Tests/Fixtures/App/app/config/config_test_with_hidden_fields.yml b/Resources/test/Fixtures/App/app/config/config_test_with_hidden_fields.yml similarity index 100% rename from Tests/Fixtures/App/app/config/config_test_with_hidden_fields.yml rename to Resources/test/Fixtures/App/app/config/config_test_with_hidden_fields.yml diff --git a/Tests/Fixtures/App/app/config/parameters.gitlab-ci.yml b/Resources/test/Fixtures/App/app/config/parameters.gitlab-ci.yml similarity index 100% rename from Tests/Fixtures/App/app/config/parameters.gitlab-ci.yml rename to Resources/test/Fixtures/App/app/config/parameters.gitlab-ci.yml diff --git a/Tests/Fixtures/App/app/config/parameters.yml.dist b/Resources/test/Fixtures/App/app/config/parameters.yml.dist similarity index 100% rename from Tests/Fixtures/App/app/config/parameters.yml.dist rename to Resources/test/Fixtures/App/app/config/parameters.yml.dist diff --git a/Tests/Fixtures/App/app/config/routing.yml b/Resources/test/Fixtures/App/app/config/routing.yml similarity index 100% rename from Tests/Fixtures/App/app/config/routing.yml rename to Resources/test/Fixtures/App/app/config/routing.yml diff --git a/Resources/test/Fixtures/App/app/console b/Resources/test/Fixtures/App/app/console new file mode 100644 index 000000000..f6fd8e5ef --- /dev/null +++ b/Resources/test/Fixtures/App/app/console @@ -0,0 +1,27 @@ +#!/usr/bin/env php +getParameterOption(array('--env', '-e'), getenv('SYMFONY_ENV') ?: 'dev'); +$debug = getenv('SYMFONY_DEBUG') !== '0' && !$input->hasParameterOption(array('--no-debug', '')) && $env !== 'prod'; + +if ($debug) { + Debug::enable(); +} + +$kernel = new AppKernel($env, $debug); +$application = new Application($kernel); +$application->run($input); diff --git a/Tests/Fixtures/App/app/console.php b/Resources/test/Fixtures/App/app/console.php similarity index 100% rename from Tests/Fixtures/App/app/console.php rename to Resources/test/Fixtures/App/app/console.php diff --git a/Tests/Fixtures/App/logs/empty b/Resources/test/Fixtures/App/logs/empty similarity index 100% rename from Tests/Fixtures/App/logs/empty rename to Resources/test/Fixtures/App/logs/empty diff --git a/Tests/Fixtures/App/web/app_dev.php b/Resources/test/Fixtures/App/web/app_dev.php similarity index 100% rename from Tests/Fixtures/App/web/app_dev.php rename to Resources/test/Fixtures/App/web/app_dev.php diff --git a/Tests/Fixtures/App/web/bundles/chillmain/CONTRIBUTING.md b/Resources/test/Fixtures/App/web/bundles/chillmain/CONTRIBUTING.md similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/CONTRIBUTING.md rename to Resources/test/Fixtures/App/web/bundles/chillmain/CONTRIBUTING.md diff --git a/Tests/Fixtures/App/web/bundles/chillmain/LICENSE b/Resources/test/Fixtures/App/web/bundles/chillmain/LICENSE similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/LICENSE rename to Resources/test/Fixtures/App/web/bundles/chillmain/LICENSE diff --git a/Tests/Fixtures/App/web/bundles/chillmain/README.md b/Resources/test/Fixtures/App/web/bundles/chillmain/README.md similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/README.md rename to Resources/test/Fixtures/App/web/bundles/chillmain/README.md diff --git a/Tests/Fixtures/App/web/bundles/chillmain/bower.json b/Resources/test/Fixtures/App/web/bundles/chillmain/bower.json similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/bower.json rename to Resources/test/Fixtures/App/web/bundles/chillmain/bower.json diff --git a/Tests/Fixtures/App/web/bundles/chillmain/component.json b/Resources/test/Fixtures/App/web/bundles/chillmain/component.json similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/component.json rename to Resources/test/Fixtures/App/web/bundles/chillmain/component.json diff --git a/Tests/Fixtures/App/web/bundles/chillmain/composer.json b/Resources/test/Fixtures/App/web/bundles/chillmain/composer.json similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/composer.json rename to Resources/test/Fixtures/App/web/bundles/chillmain/composer.json diff --git a/Tests/Fixtures/App/web/bundles/chillmain/css/admin.css b/Resources/test/Fixtures/App/web/bundles/chillmain/css/admin.css similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/css/admin.css rename to Resources/test/Fixtures/App/web/bundles/chillmain/css/admin.css diff --git a/Tests/Fixtures/App/web/bundles/chillmain/css/chillmain.css b/Resources/test/Fixtures/App/web/bundles/chillmain/css/chillmain.css similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/css/chillmain.css rename to Resources/test/Fixtures/App/web/bundles/chillmain/css/chillmain.css diff --git a/Tests/Fixtures/App/web/bundles/chillmain/css/gumby.css b/Resources/test/Fixtures/App/web/bundles/chillmain/css/gumby.css similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/css/gumby.css rename to Resources/test/Fixtures/App/web/bundles/chillmain/css/gumby.css diff --git a/Tests/Fixtures/App/web/bundles/chillmain/css/pikaday.css b/Resources/test/Fixtures/App/web/bundles/chillmain/css/pikaday.css similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/css/pikaday.css rename to Resources/test/Fixtures/App/web/bundles/chillmain/css/pikaday.css diff --git a/Tests/Fixtures/App/web/bundles/chillmain/fonts/FontAwesome.otf b/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/FontAwesome.otf similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/fonts/FontAwesome.otf rename to Resources/test/Fixtures/App/web/bundles/chillmain/fonts/FontAwesome.otf diff --git a/Tests/Fixtures/App/web/bundles/chillmain/fonts/Merriweather_Sans/MerriweatherSans-Bold.ttf b/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/Merriweather_Sans/MerriweatherSans-Bold.ttf similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/fonts/Merriweather_Sans/MerriweatherSans-Bold.ttf rename to Resources/test/Fixtures/App/web/bundles/chillmain/fonts/Merriweather_Sans/MerriweatherSans-Bold.ttf diff --git a/Tests/Fixtures/App/web/bundles/chillmain/fonts/Merriweather_Sans/MerriweatherSans-BoldItalic.ttf b/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/Merriweather_Sans/MerriweatherSans-BoldItalic.ttf similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/fonts/Merriweather_Sans/MerriweatherSans-BoldItalic.ttf rename to Resources/test/Fixtures/App/web/bundles/chillmain/fonts/Merriweather_Sans/MerriweatherSans-BoldItalic.ttf diff --git a/Tests/Fixtures/App/web/bundles/chillmain/fonts/Merriweather_Sans/MerriweatherSans-ExtraBold.ttf b/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/Merriweather_Sans/MerriweatherSans-ExtraBold.ttf similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/fonts/Merriweather_Sans/MerriweatherSans-ExtraBold.ttf rename to Resources/test/Fixtures/App/web/bundles/chillmain/fonts/Merriweather_Sans/MerriweatherSans-ExtraBold.ttf diff --git a/Tests/Fixtures/App/web/bundles/chillmain/fonts/Merriweather_Sans/MerriweatherSans-ExtraBoldItalic.ttf b/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/Merriweather_Sans/MerriweatherSans-ExtraBoldItalic.ttf similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/fonts/Merriweather_Sans/MerriweatherSans-ExtraBoldItalic.ttf rename to Resources/test/Fixtures/App/web/bundles/chillmain/fonts/Merriweather_Sans/MerriweatherSans-ExtraBoldItalic.ttf diff --git a/Tests/Fixtures/App/web/bundles/chillmain/fonts/Merriweather_Sans/MerriweatherSans-Italic.ttf b/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/Merriweather_Sans/MerriweatherSans-Italic.ttf similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/fonts/Merriweather_Sans/MerriweatherSans-Italic.ttf rename to Resources/test/Fixtures/App/web/bundles/chillmain/fonts/Merriweather_Sans/MerriweatherSans-Italic.ttf diff --git a/Tests/Fixtures/App/web/bundles/chillmain/fonts/Merriweather_Sans/MerriweatherSans-Light.ttf b/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/Merriweather_Sans/MerriweatherSans-Light.ttf similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/fonts/Merriweather_Sans/MerriweatherSans-Light.ttf rename to Resources/test/Fixtures/App/web/bundles/chillmain/fonts/Merriweather_Sans/MerriweatherSans-Light.ttf diff --git a/Tests/Fixtures/App/web/bundles/chillmain/fonts/Merriweather_Sans/MerriweatherSans-LightItalic.ttf b/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/Merriweather_Sans/MerriweatherSans-LightItalic.ttf similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/fonts/Merriweather_Sans/MerriweatherSans-LightItalic.ttf rename to Resources/test/Fixtures/App/web/bundles/chillmain/fonts/Merriweather_Sans/MerriweatherSans-LightItalic.ttf diff --git a/Tests/Fixtures/App/web/bundles/chillmain/fonts/Merriweather_Sans/MerriweatherSans-Regular.ttf b/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/Merriweather_Sans/MerriweatherSans-Regular.ttf similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/fonts/Merriweather_Sans/MerriweatherSans-Regular.ttf rename to Resources/test/Fixtures/App/web/bundles/chillmain/fonts/Merriweather_Sans/MerriweatherSans-Regular.ttf diff --git a/Tests/Fixtures/App/web/bundles/chillmain/fonts/Merriweather_Sans/OFL.txt b/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/Merriweather_Sans/OFL.txt similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/fonts/Merriweather_Sans/OFL.txt rename to Resources/test/Fixtures/App/web/bundles/chillmain/fonts/Merriweather_Sans/OFL.txt diff --git a/Tests/Fixtures/App/web/bundles/chillmain/fonts/Oxygen/OFL.txt b/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/Oxygen/OFL.txt similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/fonts/Oxygen/OFL.txt rename to Resources/test/Fixtures/App/web/bundles/chillmain/fonts/Oxygen/OFL.txt diff --git a/Tests/Fixtures/App/web/bundles/chillmain/fonts/Oxygen/Oxygen-Bold.ttf b/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/Oxygen/Oxygen-Bold.ttf similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/fonts/Oxygen/Oxygen-Bold.ttf rename to Resources/test/Fixtures/App/web/bundles/chillmain/fonts/Oxygen/Oxygen-Bold.ttf diff --git a/Tests/Fixtures/App/web/bundles/chillmain/fonts/Oxygen/Oxygen-Light.ttf b/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/Oxygen/Oxygen-Light.ttf similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/fonts/Oxygen/Oxygen-Light.ttf rename to Resources/test/Fixtures/App/web/bundles/chillmain/fonts/Oxygen/Oxygen-Light.ttf diff --git a/Tests/Fixtures/App/web/bundles/chillmain/fonts/Oxygen/Oxygen-Regular.ttf b/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/Oxygen/Oxygen-Regular.ttf similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/fonts/Oxygen/Oxygen-Regular.ttf rename to Resources/test/Fixtures/App/web/bundles/chillmain/fonts/Oxygen/Oxygen-Regular.ttf diff --git a/Tests/Fixtures/App/web/bundles/chillmain/fonts/Oxygen_Mono/OFL.txt b/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/Oxygen_Mono/OFL.txt similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/fonts/Oxygen_Mono/OFL.txt rename to Resources/test/Fixtures/App/web/bundles/chillmain/fonts/Oxygen_Mono/OFL.txt diff --git a/Tests/Fixtures/App/web/bundles/chillmain/fonts/Oxygen_Mono/OxygenMono-Regular.ttf b/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/Oxygen_Mono/OxygenMono-Regular.ttf similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/fonts/Oxygen_Mono/OxygenMono-Regular.ttf rename to Resources/test/Fixtures/App/web/bundles/chillmain/fonts/Oxygen_Mono/OxygenMono-Regular.ttf diff --git a/Tests/Fixtures/App/web/bundles/chillmain/fonts/fontawesome-webfont.eot b/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/fontawesome-webfont.eot similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/fonts/fontawesome-webfont.eot rename to Resources/test/Fixtures/App/web/bundles/chillmain/fonts/fontawesome-webfont.eot diff --git a/Tests/Fixtures/App/web/bundles/chillmain/fonts/fontawesome-webfont.svg b/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/fontawesome-webfont.svg similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/fonts/fontawesome-webfont.svg rename to Resources/test/Fixtures/App/web/bundles/chillmain/fonts/fontawesome-webfont.svg diff --git a/Tests/Fixtures/App/web/bundles/chillmain/fonts/fontawesome-webfont.ttf b/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/fontawesome-webfont.ttf similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/fonts/fontawesome-webfont.ttf rename to Resources/test/Fixtures/App/web/bundles/chillmain/fonts/fontawesome-webfont.ttf diff --git a/Tests/Fixtures/App/web/bundles/chillmain/fonts/fontawesome-webfont.woff b/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/fontawesome-webfont.woff similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/fonts/fontawesome-webfont.woff rename to Resources/test/Fixtures/App/web/bundles/chillmain/fonts/fontawesome-webfont.woff diff --git a/Tests/Fixtures/App/web/bundles/chillmain/fonts/icons/Merriweather_Sans/MerriweatherSans-Bold.ttf b/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/icons/Merriweather_Sans/MerriweatherSans-Bold.ttf similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/fonts/icons/Merriweather_Sans/MerriweatherSans-Bold.ttf rename to Resources/test/Fixtures/App/web/bundles/chillmain/fonts/icons/Merriweather_Sans/MerriweatherSans-Bold.ttf diff --git a/Tests/Fixtures/App/web/bundles/chillmain/fonts/icons/Merriweather_Sans/MerriweatherSans-BoldItalic.ttf b/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/icons/Merriweather_Sans/MerriweatherSans-BoldItalic.ttf similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/fonts/icons/Merriweather_Sans/MerriweatherSans-BoldItalic.ttf rename to Resources/test/Fixtures/App/web/bundles/chillmain/fonts/icons/Merriweather_Sans/MerriweatherSans-BoldItalic.ttf diff --git a/Tests/Fixtures/App/web/bundles/chillmain/fonts/icons/Merriweather_Sans/MerriweatherSans-ExtraBold.ttf b/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/icons/Merriweather_Sans/MerriweatherSans-ExtraBold.ttf similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/fonts/icons/Merriweather_Sans/MerriweatherSans-ExtraBold.ttf rename to Resources/test/Fixtures/App/web/bundles/chillmain/fonts/icons/Merriweather_Sans/MerriweatherSans-ExtraBold.ttf diff --git a/Tests/Fixtures/App/web/bundles/chillmain/fonts/icons/Merriweather_Sans/MerriweatherSans-ExtraBoldItalic.ttf b/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/icons/Merriweather_Sans/MerriweatherSans-ExtraBoldItalic.ttf similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/fonts/icons/Merriweather_Sans/MerriweatherSans-ExtraBoldItalic.ttf rename to Resources/test/Fixtures/App/web/bundles/chillmain/fonts/icons/Merriweather_Sans/MerriweatherSans-ExtraBoldItalic.ttf diff --git a/Tests/Fixtures/App/web/bundles/chillmain/fonts/icons/Merriweather_Sans/MerriweatherSans-Italic.ttf b/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/icons/Merriweather_Sans/MerriweatherSans-Italic.ttf similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/fonts/icons/Merriweather_Sans/MerriweatherSans-Italic.ttf rename to Resources/test/Fixtures/App/web/bundles/chillmain/fonts/icons/Merriweather_Sans/MerriweatherSans-Italic.ttf diff --git a/Tests/Fixtures/App/web/bundles/chillmain/fonts/icons/Merriweather_Sans/MerriweatherSans-Light.ttf b/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/icons/Merriweather_Sans/MerriweatherSans-Light.ttf similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/fonts/icons/Merriweather_Sans/MerriweatherSans-Light.ttf rename to Resources/test/Fixtures/App/web/bundles/chillmain/fonts/icons/Merriweather_Sans/MerriweatherSans-Light.ttf diff --git a/Tests/Fixtures/App/web/bundles/chillmain/fonts/icons/Merriweather_Sans/MerriweatherSans-LightItalic.ttf b/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/icons/Merriweather_Sans/MerriweatherSans-LightItalic.ttf similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/fonts/icons/Merriweather_Sans/MerriweatherSans-LightItalic.ttf rename to Resources/test/Fixtures/App/web/bundles/chillmain/fonts/icons/Merriweather_Sans/MerriweatherSans-LightItalic.ttf diff --git a/Tests/Fixtures/App/web/bundles/chillmain/fonts/icons/Merriweather_Sans/MerriweatherSans-Regular.ttf b/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/icons/Merriweather_Sans/MerriweatherSans-Regular.ttf similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/fonts/icons/Merriweather_Sans/MerriweatherSans-Regular.ttf rename to Resources/test/Fixtures/App/web/bundles/chillmain/fonts/icons/Merriweather_Sans/MerriweatherSans-Regular.ttf diff --git a/Tests/Fixtures/App/web/bundles/chillmain/fonts/icons/Merriweather_Sans/OFL.txt b/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/icons/Merriweather_Sans/OFL.txt similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/fonts/icons/Merriweather_Sans/OFL.txt rename to Resources/test/Fixtures/App/web/bundles/chillmain/fonts/icons/Merriweather_Sans/OFL.txt diff --git a/Tests/Fixtures/App/web/bundles/chillmain/fonts/icons/Oxygen/OFL.txt b/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/icons/Oxygen/OFL.txt similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/fonts/icons/Oxygen/OFL.txt rename to Resources/test/Fixtures/App/web/bundles/chillmain/fonts/icons/Oxygen/OFL.txt diff --git a/Tests/Fixtures/App/web/bundles/chillmain/fonts/icons/Oxygen/Oxygen-Bold.ttf b/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/icons/Oxygen/Oxygen-Bold.ttf similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/fonts/icons/Oxygen/Oxygen-Bold.ttf rename to Resources/test/Fixtures/App/web/bundles/chillmain/fonts/icons/Oxygen/Oxygen-Bold.ttf diff --git a/Tests/Fixtures/App/web/bundles/chillmain/fonts/icons/Oxygen/Oxygen-Light.ttf b/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/icons/Oxygen/Oxygen-Light.ttf similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/fonts/icons/Oxygen/Oxygen-Light.ttf rename to Resources/test/Fixtures/App/web/bundles/chillmain/fonts/icons/Oxygen/Oxygen-Light.ttf diff --git a/Tests/Fixtures/App/web/bundles/chillmain/fonts/icons/Oxygen/Oxygen-Regular.ttf b/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/icons/Oxygen/Oxygen-Regular.ttf similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/fonts/icons/Oxygen/Oxygen-Regular.ttf rename to Resources/test/Fixtures/App/web/bundles/chillmain/fonts/icons/Oxygen/Oxygen-Regular.ttf diff --git a/Tests/Fixtures/App/web/bundles/chillmain/fonts/icons/Oxygen_Mono/OFL.txt b/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/icons/Oxygen_Mono/OFL.txt similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/fonts/icons/Oxygen_Mono/OFL.txt rename to Resources/test/Fixtures/App/web/bundles/chillmain/fonts/icons/Oxygen_Mono/OFL.txt diff --git a/Tests/Fixtures/App/web/bundles/chillmain/fonts/icons/Oxygen_Mono/OxygenMono-Regular.ttf b/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/icons/Oxygen_Mono/OxygenMono-Regular.ttf similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/fonts/icons/Oxygen_Mono/OxygenMono-Regular.ttf rename to Resources/test/Fixtures/App/web/bundles/chillmain/fonts/icons/Oxygen_Mono/OxygenMono-Regular.ttf diff --git a/Tests/Fixtures/App/web/bundles/chillmain/fonts/icons/entypo.eot b/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/icons/entypo.eot similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/fonts/icons/entypo.eot rename to Resources/test/Fixtures/App/web/bundles/chillmain/fonts/icons/entypo.eot diff --git a/Tests/Fixtures/App/web/bundles/chillmain/fonts/icons/entypo.ttf b/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/icons/entypo.ttf similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/fonts/icons/entypo.ttf rename to Resources/test/Fixtures/App/web/bundles/chillmain/fonts/icons/entypo.ttf diff --git a/Tests/Fixtures/App/web/bundles/chillmain/fonts/icons/entypo.woff b/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/icons/entypo.woff similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/fonts/icons/entypo.woff rename to Resources/test/Fixtures/App/web/bundles/chillmain/fonts/icons/entypo.woff diff --git a/Tests/Fixtures/App/web/bundles/chillmain/js/jquery.js b/Resources/test/Fixtures/App/web/bundles/chillmain/js/jquery.js similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/js/jquery.js rename to Resources/test/Fixtures/App/web/bundles/chillmain/js/jquery.js diff --git a/Tests/Fixtures/App/web/bundles/chillmain/js/modernizr-2.6.2.min.js b/Resources/test/Fixtures/App/web/bundles/chillmain/js/modernizr-2.6.2.min.js similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/js/modernizr-2.6.2.min.js rename to Resources/test/Fixtures/App/web/bundles/chillmain/js/modernizr-2.6.2.min.js diff --git a/Tests/Fixtures/App/web/bundles/chillmain/moment.js b/Resources/test/Fixtures/App/web/bundles/chillmain/moment.js similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/moment.js rename to Resources/test/Fixtures/App/web/bundles/chillmain/moment.js diff --git a/Tests/Fixtures/App/web/bundles/chillmain/package.json b/Resources/test/Fixtures/App/web/bundles/chillmain/package.json similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/package.json rename to Resources/test/Fixtures/App/web/bundles/chillmain/package.json diff --git a/Tests/Fixtures/App/web/bundles/chillmain/pikaday.js b/Resources/test/Fixtures/App/web/bundles/chillmain/pikaday.js similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/pikaday.js rename to Resources/test/Fixtures/App/web/bundles/chillmain/pikaday.js diff --git a/Tests/Fixtures/App/web/bundles/chillmain/plugins/pikaday.jquery.js b/Resources/test/Fixtures/App/web/bundles/chillmain/plugins/pikaday.jquery.js similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/plugins/pikaday.jquery.js rename to Resources/test/Fixtures/App/web/bundles/chillmain/plugins/pikaday.jquery.js diff --git a/Tests/Fixtures/App/web/bundles/chillmain/release.sh b/Resources/test/Fixtures/App/web/bundles/chillmain/release.sh similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/release.sh rename to Resources/test/Fixtures/App/web/bundles/chillmain/release.sh diff --git a/Tests/Fixtures/App/web/bundles/chillmain/select2-bootstrap.css b/Resources/test/Fixtures/App/web/bundles/chillmain/select2-bootstrap.css similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/select2-bootstrap.css rename to Resources/test/Fixtures/App/web/bundles/chillmain/select2-bootstrap.css diff --git a/Tests/Fixtures/App/web/bundles/chillmain/select2-spinner.gif b/Resources/test/Fixtures/App/web/bundles/chillmain/select2-spinner.gif similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/select2-spinner.gif rename to Resources/test/Fixtures/App/web/bundles/chillmain/select2-spinner.gif diff --git a/Tests/Fixtures/App/web/bundles/chillmain/select2.css b/Resources/test/Fixtures/App/web/bundles/chillmain/select2.css similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/select2.css rename to Resources/test/Fixtures/App/web/bundles/chillmain/select2.css diff --git a/Tests/Fixtures/App/web/bundles/chillmain/select2.jquery.json b/Resources/test/Fixtures/App/web/bundles/chillmain/select2.jquery.json similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/select2.jquery.json rename to Resources/test/Fixtures/App/web/bundles/chillmain/select2.jquery.json diff --git a/Tests/Fixtures/App/web/bundles/chillmain/select2.js b/Resources/test/Fixtures/App/web/bundles/chillmain/select2.js similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/select2.js rename to Resources/test/Fixtures/App/web/bundles/chillmain/select2.js diff --git a/Tests/Fixtures/App/web/bundles/chillmain/select2.min.js b/Resources/test/Fixtures/App/web/bundles/chillmain/select2.min.js similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/select2.min.js rename to Resources/test/Fixtures/App/web/bundles/chillmain/select2.min.js diff --git a/Tests/Fixtures/App/web/bundles/chillmain/select2.png b/Resources/test/Fixtures/App/web/bundles/chillmain/select2.png similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/select2.png rename to Resources/test/Fixtures/App/web/bundles/chillmain/select2.png diff --git a/Tests/Fixtures/App/web/bundles/chillmain/select2_locale_ar.js b/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_ar.js similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/select2_locale_ar.js rename to Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_ar.js diff --git a/Tests/Fixtures/App/web/bundles/chillmain/select2_locale_az.js b/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_az.js similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/select2_locale_az.js rename to Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_az.js diff --git a/Tests/Fixtures/App/web/bundles/chillmain/select2_locale_bg.js b/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_bg.js similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/select2_locale_bg.js rename to Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_bg.js diff --git a/Tests/Fixtures/App/web/bundles/chillmain/select2_locale_ca.js b/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_ca.js similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/select2_locale_ca.js rename to Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_ca.js diff --git a/Tests/Fixtures/App/web/bundles/chillmain/select2_locale_cs.js b/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_cs.js similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/select2_locale_cs.js rename to Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_cs.js diff --git a/Tests/Fixtures/App/web/bundles/chillmain/select2_locale_da.js b/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_da.js similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/select2_locale_da.js rename to Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_da.js diff --git a/Tests/Fixtures/App/web/bundles/chillmain/select2_locale_de.js b/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_de.js similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/select2_locale_de.js rename to Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_de.js diff --git a/Tests/Fixtures/App/web/bundles/chillmain/select2_locale_el.js b/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_el.js similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/select2_locale_el.js rename to Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_el.js diff --git a/Tests/Fixtures/App/web/bundles/chillmain/select2_locale_en.js.template b/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_en.js.template similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/select2_locale_en.js.template rename to Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_en.js.template diff --git a/Tests/Fixtures/App/web/bundles/chillmain/select2_locale_es.js b/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_es.js similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/select2_locale_es.js rename to Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_es.js diff --git a/Tests/Fixtures/App/web/bundles/chillmain/select2_locale_et.js b/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_et.js similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/select2_locale_et.js rename to Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_et.js diff --git a/Tests/Fixtures/App/web/bundles/chillmain/select2_locale_eu.js b/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_eu.js similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/select2_locale_eu.js rename to Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_eu.js diff --git a/Tests/Fixtures/App/web/bundles/chillmain/select2_locale_fa.js b/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_fa.js similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/select2_locale_fa.js rename to Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_fa.js diff --git a/Tests/Fixtures/App/web/bundles/chillmain/select2_locale_fi.js b/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_fi.js similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/select2_locale_fi.js rename to Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_fi.js diff --git a/Tests/Fixtures/App/web/bundles/chillmain/select2_locale_fr.js b/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_fr.js similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/select2_locale_fr.js rename to Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_fr.js diff --git a/Tests/Fixtures/App/web/bundles/chillmain/select2_locale_gl.js b/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_gl.js similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/select2_locale_gl.js rename to Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_gl.js diff --git a/Tests/Fixtures/App/web/bundles/chillmain/select2_locale_he.js b/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_he.js similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/select2_locale_he.js rename to Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_he.js diff --git a/Tests/Fixtures/App/web/bundles/chillmain/select2_locale_hr.js b/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_hr.js similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/select2_locale_hr.js rename to Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_hr.js diff --git a/Tests/Fixtures/App/web/bundles/chillmain/select2_locale_hu.js b/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_hu.js similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/select2_locale_hu.js rename to Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_hu.js diff --git a/Tests/Fixtures/App/web/bundles/chillmain/select2_locale_id.js b/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_id.js similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/select2_locale_id.js rename to Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_id.js diff --git a/Tests/Fixtures/App/web/bundles/chillmain/select2_locale_is.js b/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_is.js similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/select2_locale_is.js rename to Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_is.js diff --git a/Tests/Fixtures/App/web/bundles/chillmain/select2_locale_it.js b/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_it.js similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/select2_locale_it.js rename to Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_it.js diff --git a/Tests/Fixtures/App/web/bundles/chillmain/select2_locale_ja.js b/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_ja.js similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/select2_locale_ja.js rename to Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_ja.js diff --git a/Tests/Fixtures/App/web/bundles/chillmain/select2_locale_ka.js b/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_ka.js similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/select2_locale_ka.js rename to Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_ka.js diff --git a/Tests/Fixtures/App/web/bundles/chillmain/select2_locale_ko.js b/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_ko.js similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/select2_locale_ko.js rename to Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_ko.js diff --git a/Tests/Fixtures/App/web/bundles/chillmain/select2_locale_lt.js b/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_lt.js similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/select2_locale_lt.js rename to Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_lt.js diff --git a/Tests/Fixtures/App/web/bundles/chillmain/select2_locale_lv.js b/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_lv.js similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/select2_locale_lv.js rename to Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_lv.js diff --git a/Tests/Fixtures/App/web/bundles/chillmain/select2_locale_mk.js b/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_mk.js similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/select2_locale_mk.js rename to Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_mk.js diff --git a/Tests/Fixtures/App/web/bundles/chillmain/select2_locale_ms.js b/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_ms.js similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/select2_locale_ms.js rename to Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_ms.js diff --git a/Tests/Fixtures/App/web/bundles/chillmain/select2_locale_nb.js b/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_nb.js similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/select2_locale_nb.js rename to Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_nb.js diff --git a/Tests/Fixtures/App/web/bundles/chillmain/select2_locale_nl.js b/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_nl.js similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/select2_locale_nl.js rename to Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_nl.js diff --git a/Tests/Fixtures/App/web/bundles/chillmain/select2_locale_pl.js b/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_pl.js similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/select2_locale_pl.js rename to Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_pl.js diff --git a/Tests/Fixtures/App/web/bundles/chillmain/select2_locale_pt-BR.js b/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_pt-BR.js similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/select2_locale_pt-BR.js rename to Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_pt-BR.js diff --git a/Tests/Fixtures/App/web/bundles/chillmain/select2_locale_pt-PT.js b/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_pt-PT.js similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/select2_locale_pt-PT.js rename to Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_pt-PT.js diff --git a/Tests/Fixtures/App/web/bundles/chillmain/select2_locale_ro.js b/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_ro.js similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/select2_locale_ro.js rename to Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_ro.js diff --git a/Tests/Fixtures/App/web/bundles/chillmain/select2_locale_rs.js b/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_rs.js similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/select2_locale_rs.js rename to Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_rs.js diff --git a/Tests/Fixtures/App/web/bundles/chillmain/select2_locale_ru.js b/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_ru.js similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/select2_locale_ru.js rename to Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_ru.js diff --git a/Tests/Fixtures/App/web/bundles/chillmain/select2_locale_sk.js b/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_sk.js similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/select2_locale_sk.js rename to Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_sk.js diff --git a/Tests/Fixtures/App/web/bundles/chillmain/select2_locale_sv.js b/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_sv.js similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/select2_locale_sv.js rename to Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_sv.js diff --git a/Tests/Fixtures/App/web/bundles/chillmain/select2_locale_th.js b/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_th.js similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/select2_locale_th.js rename to Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_th.js diff --git a/Tests/Fixtures/App/web/bundles/chillmain/select2_locale_tr.js b/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_tr.js similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/select2_locale_tr.js rename to Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_tr.js diff --git a/Tests/Fixtures/App/web/bundles/chillmain/select2_locale_ug-CN.js b/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_ug-CN.js similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/select2_locale_ug-CN.js rename to Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_ug-CN.js diff --git a/Tests/Fixtures/App/web/bundles/chillmain/select2_locale_uk.js b/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_uk.js similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/select2_locale_uk.js rename to Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_uk.js diff --git a/Tests/Fixtures/App/web/bundles/chillmain/select2_locale_vi.js b/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_vi.js similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/select2_locale_vi.js rename to Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_vi.js diff --git a/Tests/Fixtures/App/web/bundles/chillmain/select2_locale_zh-CN.js b/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_zh-CN.js similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/select2_locale_zh-CN.js rename to Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_zh-CN.js diff --git a/Tests/Fixtures/App/web/bundles/chillmain/select2_locale_zh-TW.js b/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_zh-TW.js similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/select2_locale_zh-TW.js rename to Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_zh-TW.js diff --git a/Tests/Fixtures/App/web/bundles/chillmain/select2x2.png b/Resources/test/Fixtures/App/web/bundles/chillmain/select2x2.png similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/select2x2.png rename to Resources/test/Fixtures/App/web/bundles/chillmain/select2x2.png diff --git a/Tests/Fixtures/App/web/bundles/chillmain/stylesheets/sass/_custom.scss b/Resources/test/Fixtures/App/web/bundles/chillmain/stylesheets/sass/_custom.scss similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/stylesheets/sass/_custom.scss rename to Resources/test/Fixtures/App/web/bundles/chillmain/stylesheets/sass/_custom.scss diff --git a/Tests/Fixtures/App/web/bundles/chillmain/stylesheets/scratch.css b/Resources/test/Fixtures/App/web/bundles/chillmain/stylesheets/scratch.css similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/stylesheets/scratch.css rename to Resources/test/Fixtures/App/web/bundles/chillmain/stylesheets/scratch.css diff --git a/Tests/Fixtures/App/web/bundles/chillmain/stylesheets/scratch.css.map b/Resources/test/Fixtures/App/web/bundles/chillmain/stylesheets/scratch.css.map similarity index 100% rename from Tests/Fixtures/App/web/bundles/chillmain/stylesheets/scratch.css.map rename to Resources/test/Fixtures/App/web/bundles/chillmain/stylesheets/scratch.css.map diff --git a/Tests/Fixtures/App/web/bundles/framework/css/body.css b/Resources/test/Fixtures/App/web/bundles/framework/css/body.css similarity index 100% rename from Tests/Fixtures/App/web/bundles/framework/css/body.css rename to Resources/test/Fixtures/App/web/bundles/framework/css/body.css diff --git a/Tests/Fixtures/App/web/bundles/framework/css/exception.css b/Resources/test/Fixtures/App/web/bundles/framework/css/exception.css similarity index 100% rename from Tests/Fixtures/App/web/bundles/framework/css/exception.css rename to Resources/test/Fixtures/App/web/bundles/framework/css/exception.css diff --git a/Tests/Fixtures/App/web/bundles/framework/css/structure.css b/Resources/test/Fixtures/App/web/bundles/framework/css/structure.css similarity index 100% rename from Tests/Fixtures/App/web/bundles/framework/css/structure.css rename to Resources/test/Fixtures/App/web/bundles/framework/css/structure.css diff --git a/Tests/Fixtures/App/web/bundles/framework/images/blue_picto_less.gif b/Resources/test/Fixtures/App/web/bundles/framework/images/blue_picto_less.gif similarity index 100% rename from Tests/Fixtures/App/web/bundles/framework/images/blue_picto_less.gif rename to Resources/test/Fixtures/App/web/bundles/framework/images/blue_picto_less.gif diff --git a/Tests/Fixtures/App/web/bundles/framework/images/blue_picto_more.gif b/Resources/test/Fixtures/App/web/bundles/framework/images/blue_picto_more.gif similarity index 100% rename from Tests/Fixtures/App/web/bundles/framework/images/blue_picto_more.gif rename to Resources/test/Fixtures/App/web/bundles/framework/images/blue_picto_more.gif diff --git a/Tests/Fixtures/App/web/bundles/framework/images/grey_magnifier.png b/Resources/test/Fixtures/App/web/bundles/framework/images/grey_magnifier.png similarity index 100% rename from Tests/Fixtures/App/web/bundles/framework/images/grey_magnifier.png rename to Resources/test/Fixtures/App/web/bundles/framework/images/grey_magnifier.png diff --git a/Tests/Fixtures/App/web/bundles/framework/images/logo_symfony.png b/Resources/test/Fixtures/App/web/bundles/framework/images/logo_symfony.png similarity index 100% rename from Tests/Fixtures/App/web/bundles/framework/images/logo_symfony.png rename to Resources/test/Fixtures/App/web/bundles/framework/images/logo_symfony.png diff --git a/composer.json b/composer.json index badc5ea18..07bd7fb3b 100644 --- a/composer.json +++ b/composer.json @@ -8,6 +8,9 @@ "autoload": { "psr-4": { "Chill\\PersonBundle\\": "" } }, + "autoload-dev": { + "classmap": [ "Resources/test/Fixtures/App/app/AppKernel.php" ] + }, "authors" : [ { "name": "Champs-Libres", @@ -50,7 +53,7 @@ ] }, "extra": { - "app-migrations-dir": "Tests/Fixtures/App/app/DoctrineMigrations", + "app-migrations-dir": "Resources/test/Fixtures/App/app/DoctrineMigrations", "symfony-app-dir": "Tests/Fixtures/App/" } } diff --git a/phpunit.xml.dist b/phpunit.xml.dist index ede59a518..2d5dca36d 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,7 +1,7 @@ - - + + ./Tests @@ -18,7 +18,7 @@ - +