Merge pull request KnpLabs#74 from dantleech/pwf_fix

Pwf fix closes KnpLabs#73
EmmanuelVella · Jun 18, 2013 · db23634 · db23634
2 parents 9cf1077 + ddbd052
commit db23634
Show file tree

Hide file tree

Showing 14 changed files with 30 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
-Tests/Functional/App/cache
-Tests/Functional/App/logs
+Tests/Resources/app/cache
+Tests/Resources/app/logs
 composer.lock
 vendor
diff --git a/Document/MenuNode.php b/Document/MenuNode.php
@@ -92,17 +92,17 @@ class MenuNode implements NodeInterface, PublishWorkflowInterface
     protected $routeParameters = array();
 
     /**
-     * @PHPCRODM\Boolean()
+     * @var boolean
      */
     protected $publishable = true;
 
     /**
-     * @PHPCRODM\Date()
+     * @var \DateTime
      */
     protected $publishStartDate;
 
     /**
-     * @PHPCRODM\Date()
+     * @var \DateTime
      */
     protected $publishEndDate;
 

diff --git a/Resources/config/doctrine/MenuNode.phpcr.xml b/Resources/config/doctrine/MenuNode.phpcr.xml
@@ -24,6 +24,10 @@
 
         <field name="weak" type="boolean"/>
 
+        <field name="publishable" type="boolean"/>
+        <field name="publishStartDate" type="date"/>
+        <field name="publishEndDate" type="date"/>
+
         <field name="attributes" type="string" assoc=""/>
         <field name="childrenAttributes" type="string" assoc=""/>
         <field name="extras" type="string" multivalue="true" assoc=""/>

diff --git a/Tests/Functional/App/config/config.php b/Tests/Functional/App/config/config.php
diff --git a/Tests/Functional/Document/MenuNodeTest.php b/Tests/Functional/Document/MenuNodeTest.php
@@ -43,6 +43,9 @@ public function testMenuNode()
             'route' => 'foo_route',
             'weakContent' => $this->weakContent,
             'hardContent' => $this->hardContent,
+            'publishable' => false,
+            'publishStartDate' => new \DateTime('2013-06-18'),
+            'publishEndDate' => new \DateTime('2013-06-18'),
             'attributes' => array(
                 'attr_foobar_1' => 'barfoo',
                 'attr_foobar_2' => 'barfoo',
@@ -108,5 +111,14 @@ public function testMenuNode()
 
         // test children
         $this->assertCount(1, $menuNode->getChildren());
+
+        // test publish start and end
+        $publishStartDate = $data['publishStartDate'];
+        $publishEndDate = $data['publishEndDate'];
+
+        $this->assertInstanceOf('\DateTime', $publishStartDate);
+        $this->assertInstanceOf('\DateTime', $publishEndDate);
+        $this->assertEquals($data['publishStartDate']->format('Y-m-d'), $publishStartDate->format('Y-m-d'));
+        $this->assertEquals($data['publishEndDate']->format('Y-m-d'), $publishEndDate->format('Y-m-d'));
     }
 }
diff --git a/Tests/Functional/Document/MultilangMenuNodeTest.php b/Tests/Functional/Document/MultilangMenuNodeTest.php
@@ -24,7 +24,7 @@ public function testMenuNode()
         $this->dm->flush();
         $this->dm->clear();
 
-        $menuNode = $this->dm->find(null, '/test/test-node');
+        $menuNode = $this->dm->findTranslation(null, '/test/test-node', 'fr');
         $this->assertEquals('fr', $menuNode->getLocale());
     }
 }
diff --git a/Tests/Functional/App/AppKernel.php → Tests/Resources/app/AppKernel.php b/Tests/Functional/App/AppKernel.php → Tests/Resources/app/AppKernel.php
diff --git a/Tests/Functional/App/config/cmf_menu.yml → Tests/Resources/app/config/cmf_menu.yml b/Tests/Functional/App/config/cmf_menu.yml → Tests/Resources/app/config/cmf_menu.yml
diff --git a/Tests/Resources/app/config/config.php b/Tests/Resources/app/config/config.php
@@ -0,0 +1,6 @@
+<?php
+
+$loader->import(CMF_TEST_CONFIG_DIR.'/default.php');
+$loader->import(CMF_TEST_CONFIG_DIR.'/phpcr_odm.php');
+$loader->import(CMF_TEST_CONFIG_DIR.'/sonata_admin.php');
+$loader->import(__DIR__.'/cmf_menu.yml');
diff --git a/Tests/Functional/App/config/routing.php → Tests/Resources/app/config/routing.php b/Tests/Functional/App/config/routing.php → Tests/Resources/app/config/routing.php
diff --git a/Tests/ContentAwareFactoryTest.php → Tests/Unit/ContentAwareFactoryTest.php b/Tests/ContentAwareFactoryTest.php → Tests/Unit/ContentAwareFactoryTest.php
diff --git a/Tests/Document/MenuNodeTest.php → Tests/Unit/Document/MenuNodeTest.php b/Tests/Document/MenuNodeTest.php → Tests/Unit/Document/MenuNodeTest.php
@@ -78,7 +78,7 @@ public function testPublishWorkflowInterface()
         $this->assertNull($n->getPublishStartDate());
         $this->assertNull($n->getPublishEndDate());
 
-        $n->setIsPublishable(false);
+        $n->setPublishable(false);
         $n->setPublishStartDate($startDate);
         $n->setPublishEndDate($endDate);
 

diff --git a/Tests/Document/MultilangMenuNodeTest.php → ...s/Unit/Document/MultilangMenuNodeTest.php b/Tests/Document/MultilangMenuNodeTest.php → ...s/Unit/Document/MultilangMenuNodeTest.php
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -26,7 +26,7 @@
     </filter>
 
     <php>
-        <server name="KERNEL_DIR" value="Tests/Functional/App" />
+        <server name="KERNEL_DIR" value="Tests/Resources/app" />
     </php>
 
 </phpunit>