Merge pull request #19 from tractorcow/pulls/4.0/fix-ci

BUG Fix tests
silverstripe · Jan 26, 2016 · 7597ed6 · 7597ed6
2 parents cd306ec + ed76b3f
commit 7597ed6
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -28,9 +28,10 @@ before_script:
   - composer self-update || true
   - git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support
   - "if [ \"$BEHAT_TEST\" = \"\" ]; then php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss; fi"
-  - "if [ \"$BEHAT_TEST\" = \"1\" ]; then php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss --require silverstripe/behat-extension; fi"
+  - "if [ \"$BEHAT_TEST\" = \"1\" ]; then php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss --require silverstripe/behat-extension,silverstripe/cms; fi"
   - cd ~/builds/ss
-  - composer install
+  - php ~/travis-support/travis_setup_selenium.php --if-env BEHAT_TEST
+  - php ~/travis-support/travis_setup_php54_webserver.php --if-env BEHAT_TEST
 
 script:
   - "if [ \"$BEHAT_TEST\" = \"\" ]; then vendor/bin/phpunit siteconfig/tests; fi"

diff --git a/tests/behat/behat.yml b/tests/behat/behat.yml
@@ -1,6 +1,6 @@
 default:
   context:
-    class: SilverStripe\Cms\Test\Behaviour\FeatureContext
+    class: SilverStripe\Siteconfig\Test\Behaviour\FeatureContext
   extensions:
     SilverStripe\BehatExtension\Extension: ~
     Behat\MinkExtension\Extension:

diff --git a/...hat/features/bootstrap/FeatureContext.php → ...ures/bootstrap/Context/FeatureContext.php b/...hat/features/bootstrap/FeatureContext.php → ...ures/bootstrap/Context/FeatureContext.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace SilverStripe\Cms\Test\Behaviour;
+namespace SilverStripe\Siteconfig\Test\Behaviour;
 
 use SilverStripe\BehatExtension\Context\SilverStripeContext;
 use SilverStripe\BehatExtension\Context\BasicContext;
@@ -33,12 +33,15 @@ public function __construct(array $parameters)
         parent::__construct($parameters);
 
         // Override existing fixture context with more specific one
-        $fixtureContext = new \SilverStripe\Cms\Test\Behaviour\FixtureContext($parameters);
+        $fixtureContext = new \SilverStripe\Siteconfig\Test\Behaviour\FixtureContext($parameters);
         $fixtureContext->setFixtureFactory($this->getFixtureFactory());
         $this->useContext('FixtureContext', $fixtureContext);
 
         // Add extra contexts with more steps
-        $this->useContext('ThemeContext', new \SilverStripe\Cms\Test\Behaviour\ThemeContext($parameters));
+        $this->useContext('ThemeContext', new \SilverStripe\Siteconfig\Test\Behaviour\ThemeContext($parameters));
+        if(!class_exists('SiteTree')) {
+            return;
+        }
 
         // Use blueprints which auto-publish all subclasses of SiteTree
         $factory = $fixtureContext->getFixtureFactory();

diff --git a/...ipe/Cms/Test/Behaviour/FixtureContext.php → ...eConfig/Test/Behaviour/FixtureContext.php b/...ipe/Cms/Test/Behaviour/FixtureContext.php → ...eConfig/Test/Behaviour/FixtureContext.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace SilverStripe\Cms\Test\Behaviour;
+namespace SilverStripe\Siteconfig\Test\Behaviour;
 
 use Behat\Behat\Context\ClosuredContextInterface;
 use Behat\Behat\Context\TranslatedContextInterface;

diff --git a/...tripe/Cms/Test/Behaviour/ThemeContext.php → ...iteConfig/Test/Behaviour/ThemeContext.php b/...tripe/Cms/Test/Behaviour/ThemeContext.php → ...iteConfig/Test/Behaviour/ThemeContext.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace SilverStripe\Cms\Test\Behaviour;
+namespace SilverStripe\Siteconfig\Test\Behaviour;
 
 use Behat\Behat\Context\ClosuredContextInterface;
 use Behat\Behat\Context\TranslatedContextInterface;