keine acceptance tests für travis

webforge-labs · Apr 10, 2012 · 3875e97 · 3875e97
1 parent 232921c
commit 3875e97
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/bin/psc-cms.phar.gz b/bin/psc-cms.phar.gz
diff --git a/tests/CMS/ProjectsFactoryTest.php b/tests/CMS/ProjectsFactoryTest.php
@@ -10,11 +10,12 @@ public function testFactory() {
     $factory = PSC::getProjectsFactory();
 
     $cms = $factory->getProject('psc-cms');
-    $tiptoi = $factory->getProject('tiptoi');
+
 
     $this->assertInstanceOf('Psc\Project',$cms); // extends Psc\CMS\Project
 
     if (PSC::getProject()->getHost() == 'psc-laptop' || PSC::getProject()->getHost() == 'psc-desktop') {
+      $tiptoi = $factory->getProject('tiptoi');
 
       $this->assertEquals('D:\www\psc-cms\Umsetzung\\',(string) $cms->getRoot());
       $this->assertEquals('D:\www\psc-cms\Umsetzung\base\src\\',(string) $cms->getSrc());
@@ -33,7 +34,7 @@ public function testFactory() {
       $this->assertEquals('D:\www\RvtiptoiCMS\Umsetzung\base\htdocs\\',(string) $tiptoi->getPath(PSC::PATH_HTDOCS));
 
     } else {
-      $this->markTestSkipped('kein Switch für Host '.PSC::getHost().' angegeben');
+      $this->markTestSkipped('kein Switch für Host '.PSC::getProject()->getHost().' angegeben');
     }
   }
 
@@ -55,15 +56,19 @@ public function testSetGetProjectsPath() {
   }
 
   public function testProjectConfigLoading() {
-    $factory = PSC::getProjectsFactory();
+    if (PSC::getProject()->getHost() == 'psc-laptop' || PSC::getProject()->getHost() == 'psc-desktop') {
-    $cms = $factory->getProject('psc-cms');
+      $factory = PSC::getProjectsFactory();
-    $tiptoi = $factory->getProject('tiptoi');
+      $cms = $factory->getProject('psc-cms');
+      $tiptoi = $factory->getProject('tiptoi');
 
-    $this->assertEquals('psc-cms',$cms->getName());
+      $this->assertEquals('psc-cms',$cms->getName());
-    $this->assertEquals('tiptoi',$tiptoi->getName());
+      $this->assertEquals('tiptoi',$tiptoi->getName());
 
-    $this->assertEquals('valueinpsc-cms',$cms->getConfiguration()->get('fixture.config.variable'));
+      $this->assertEquals('valueinpsc-cms',$cms->getConfiguration()->get('fixture.config.variable'));
-    $this->assertEquals('valueintiptoi',$tiptoi->getConfiguration()->get('fixture.config.variable'));
+      $this->assertEquals('valueintiptoi',$tiptoi->getConfiguration()->get('fixture.config.variable'));
+    } else {
+      $this->markTestSkipped('kein Switch für Host '.PSC::getProject()->getHost().' angegeben');
+    }
   }
 }
 ?>