Fixes two failing Pubsubhubbub tests

Fixes bug where Zend_Feed_Writer would render empty description elements if no description (or empty description) was set for an entry. git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@20241 44c647ce-9c0f-0410-b52a-842ac1e357ba
adaykin · Jan 12, 2010 · b0d4d78 · b0d4d78
1 parent 01476da
commit b0d4d78
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/library/Zend/Feed/Pubsubhubbub/Model/Subscription.php b/library/Zend/Feed/Pubsubhubbub/Model/Subscription.php
@@ -56,7 +56,7 @@ public function setSubscription(array $data)
             $data['created_time'] = $result->current()->created_time;
             $now = new Zend_Date;
             $data['last_modified'] = $now->get('yyyy-MM-dd HH:mm:ss');
-            $data['expiration_time'] = $now->add($data['lease_seconds'], Zend_Date::SECOND)
+            $data['expiration_time'] = $now->add($result->current()->lease_seconds, Zend_Date::SECOND)
                 ->get('yyyy-MM-dd HH:mm:ss');
             $this->_db->update(
                 $data,

diff --git a/library/Zend/Feed/Writer/Renderer/Entry/Rss.php b/library/Zend/Feed/Writer/Renderer/Entry/Rss.php
@@ -131,6 +131,9 @@ protected function _setDescription(DOMDocument $dom, DOMElement $root)
                 return;
             }
         }
+        if (!$this->getDataContainer()->getDescription()) {
+            return;
+        }
         $subtitle = $dom->createElement('description');
         $root->appendChild($subtitle);
         $text = $dom->createCDATASection($this->getDataContainer()->getDescription());

diff --git a/tests/Zend/Feed/Pubsubhubbub/Subscriber/CallbackTest.php b/tests/Zend/Feed/Pubsubhubbub/Subscriber/CallbackTest.php
@@ -252,16 +252,17 @@ public function testRespondsToValidConfirmationWith200Response()
         $rowdata = new stdClass;
         $rowdata->id = 'verifytokenkey';
         $rowdata->verify_token = hash('sha256', 'cba');
-        $t = time();
-        $rowdata->created_time = $t;
+        $t = new Zend_Date;
+        $rowdata->created_time = $t->get(Zend_Date::TIMESTAMP);
+        $rowdata->lease_seconds = 10000;
         $this->_rowset->expects($this->any())
             ->method('current')
             ->will($this->returnValue($rowdata));
 
         $this->_tableGateway->expects($this->once())
             ->method('update')
             ->with(
-                $this->equalTo(array('id'=>'verifytokenkey','verify_token'=>hash('sha256', 'cba'),'created_time'=>$t,'verified'=>'1')),
+                $this->equalTo(array('id'=>'verifytokenkey','verify_token'=>hash('sha256', 'cba'),'created_time'=>$t->get(Zend_Date::TIMESTAMP),'lease_seconds'=>10000,'subscription_state'=>'verified','last_modified'=>$t->get('yyyy-MM-dd HH:mm:ss'),'expiration_time'=>$t->add(10000,Zend_Date::SECOND)->get('yyyy-MM-dd HH:mm:ss'))),
                 $this->equalTo('id = \'verifytokenkey\'')
             );
         $this->_adapter->expects($this->once())
@@ -282,16 +283,17 @@ public function testRespondsToValidConfirmationWithBodyContainingHubChallenge()
         $rowdata = new stdClass;
         $rowdata->id = 'verifytokenkey';
         $rowdata->verify_token = hash('sha256', 'cba');
-        $t = time();
-        $rowdata->created_time = $t;
+        $t = new Zend_Date;
+        $rowdata->created_time = $t->get(Zend_Date::TIMESTAMP);
+        $rowdata->lease_seconds = 10000;
         $this->_rowset->expects($this->any())
             ->method('current')
             ->will($this->returnValue($rowdata));
 
         $this->_tableGateway->expects($this->once())
             ->method('update')
             ->with(
-                $this->equalTo(array('id'=>'verifytokenkey','verify_token'=>hash('sha256', 'cba'),'created_time'=>$t,'verified'=>'1')),
+                $this->equalTo(array('id'=>'verifytokenkey','verify_token'=>hash('sha256', 'cba'),'created_time'=>$t->get(Zend_Date::TIMESTAMP),'lease_seconds'=>10000,'subscription_state'=>'verified','last_modified'=>$t->get('yyyy-MM-dd HH:mm:ss'),'expiration_time'=>$t->add(10000,Zend_Date::SECOND)->get('yyyy-MM-dd HH:mm:ss'))),
                 $this->equalTo('id = \'verifytokenkey\'')
             );
         $this->_adapter->expects($this->once())