Merge pull request #9 from akeneo/phpspec

Phpspec + Travis
akeneo · Apr 30, 2016 · 43dac17 · 43dac17
2 parents 7f1217a + 4f47c01
commit 43dac17
Show file tree

Hide file tree

Showing 15 changed files with 193 additions and 465 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,3 @@
-/.settings
-/.buildpath
-/.project
 /cov
 /vendor
 /composer.phar

diff --git a/.travis.yml b/.travis.yml
@@ -6,9 +6,12 @@ php:
   - "5.3"
   - "hhvm"
 
+# Allow to use container infrastructure
+sudo: false
+
 before_script:
   - composer self-update
   - composer update
 
-script: phpunit --coverage-text
+script: ./bin/phpspec run spec/
 
diff --git a/Resources/config/services.yml b/Resources/config/services.yml
@@ -1,10 +1,12 @@
 parameters:
+    akeneo_measure.convert.measure_converter.class: Akeneo\Bundle\MeasureBundle\Convert\MeasureConverter
+    akeneo_measure.manager.measure_manager.class:   Akeneo\Bundle\MeasureBundle\Manager\MeasureManager
     akeneo_measure.measures_config: ~
 
 services:
     akeneo_measure.measure_converter:
-        class: Akeneo\Bundle\MeasureBundle\Convert\MeasureConverter
+        class: %akeneo_measure.convert.measure_converter.class%
         arguments: [%akeneo_measure.measures_config%]
 
     akeneo_measure.manager:
-        class: Akeneo\Bundle\MeasureBundle\Manager\MeasureManager
+        class: %akeneo_measure.manager.measure_manager.class%
diff --git a/Tests/Unit/Convert/MeasureConverterTest.php b/Tests/Unit/Convert/MeasureConverterTest.php
diff --git a/Tests/Unit/DependencyInjection/ConfigurationTest.php b/Tests/Unit/DependencyInjection/ConfigurationTest.php
diff --git a/Tests/Unit/Files/measure-test.yml b/Tests/Unit/Files/measure-test.yml