Merge remote-tracking branch 'upstream/master'

4 files changed, 282 insertions, 23 deletions

diff --git a/tests/www/bookmarksTest.php b/tests/www/bookmarksTest.php
index df360cc..ae82118 100755
--- a/tests/www/bookmarksTest.php
+++ b/tests/www/bookmarksTest.php
@@ -4,7 +4,7 @@ require_once 'HTTP/Request2.php';
 
 class www_bookmarksTest extends TestBaseApi
 {
-    protected $urlPart = 'api/posts/add';
+    protected $urlPart = 'bookmarks.php';
 
     /**
      * Test that the default privacy setting is selected in the Privacy
@@ -16,23 +16,11 @@ class www_bookmarksTest extends TestBaseApi
         $this->setUnittestConfig(
             array('defaults' => array('privacy' => 2))
         );
-        list($req, $uId) = $this->getLoggedInRequest();
-        $cookies = $req->getCookieJar();
-        $req->setMethod(HTTP_Request2::METHOD_POST);
-        $req->addPostParameter('url', 'http://www.example.org/testdefaultprivacyposts_bookmarksget');
-        $req->addPostParameter('description', 'Test bookmark 1 for default privacy.');
-        $req->addPostParameter('status', '0');
-        $req->send();
 
-        $bms = $this->bs->getBookmarks(0, null, $uId);
-        $this->assertEquals(1, count($bms['bookmarks']));
+        list($req, $uId) = $this->getLoggedInRequest();
         $user = $this->us->getUser($uId);
-        $reqUrl = $GLOBALS['unittestUrl'] . 'bookmarks.php/' . $user['username'] . '?action=get' . '&unittestMode=1';
-
-        list($req, $uId) = $this->getAuthRequest('?unittestMode=1');
         $req->setMethod(HTTP_Request2::METHOD_POST);
-        $req->setUrl($reqUrl);
-        $req->setCookieJar($cookies);
+        $req->setUrl($this->getTestUrl('/' . $user['username'] . '?action=get'));
         $req->addPostParameter('submitted', '1');
         $response = $req->send();
         $response_body = $response->getBody();
@@ -41,12 +29,15 @@ class www_bookmarksTest extends TestBaseApi
         $ns = $x->getDocNamespaces();
         $x->registerXPathNamespace('ns', reset($ns));
 
-        $elements = $x->xpath('//ns:select[@name="status"]/ns:option[@selected="selected"]');
+        $elements = $x->xpath(
+            '//ns:select[@name="status"]/ns:option[@selected="selected"]'
+        );
         $this->assertEquals(1, count($elements), 'No selected status option found');
         $this->assertEquals(2, (string)$elements[0]['value']);
     }//end testDefaultPrivacyBookmarksAddMissingTitleMissingPrivacy
 
 
+
     /**
      * Test that the default privacy setting is selected in the Privacy
      * drop-down list when a new bookmark is being created.
@@ -56,13 +47,10 @@ class www_bookmarksTest extends TestBaseApi
         $this->setUnittestConfig(
             array('defaults' => array('privacy' => 1))
         );
-        list($req, $uId) = $this->getLoggedInRequest('?unittestMode=1');
+        list($req, $uId) = $this->getLoggedInRequest();
 
         $user = $this->us->getUser($uId);
-        $reqUrl = $GLOBALS['unittestUrl'] . 'bookmarks.php/'
-            . $user['username'] . '?action=add' . '&unittestMode=1';
-        $req->setUrl($reqUrl);
-        $req->setMethod(HTTP_Request2::METHOD_GET);
+        $req->setUrl($this->getTestUrl('/' . $user['username'] . '?action=add'));
         $response = $req->send();
         $response_body = $response->getBody();
         $this->assertNotEquals('', $response_body, 'Response is empty');
@@ -71,10 +59,70 @@ class www_bookmarksTest extends TestBaseApi
         $ns = $x->getDocNamespaces();
         $x->registerXPathNamespace('ns', reset($ns));
 
-        $elements = $x->xpath('//ns:select[@name="status"]/ns:option[@selected="selected"]');
+        $elements = $x->xpath(
+            '//ns:select[@name="status"]/ns:option[@selected="selected"]'
+        );
         $this->assertEquals(1, count($elements), 'No selected status option found');
         $this->assertEquals(1, (string)$elements[0]['value']);
     }//end testDefaultPrivacyBookmarksAdd
 
+
+
+    /**
+     * Test that the private RSS link exists when a user
+     * has a private key and is enabled
+     */
+    public function testVerifyPrivateRSSLinkExists()
+    {
+        list($req, $uId) = $this->getLoggedInRequest('?unittestMode=1', true, true);
+
+        $user = $this->us->getUser($uId);
+        $req->setUrl($this->getTestUrl('/' . $user['username']));
+        $response = $req->send();
+        $response_body = $response->getBody();
+        $this->assertNotEquals('', $response_body, 'Response is empty');
+
+        $x = simplexml_load_string($response_body);
+        $ns = $x->getDocNamespaces();
+        $x->registerXPathNamespace('ns', reset($ns));
+
+        $elements = $x->xpath(
+            '//ns:link[@rel="alternate" and @type="application/rss+xml"]'
+        );
+        $this->assertEquals(
+            2, count($elements), 'Number of Links in Head not correct'
+        );
+        $this->assertContains('privateKey=', (string)$elements[1]['href']);
+    }//end testVerifyPrivateRSSLinkExists
+
+
+
+    /**
+     * Test that the private RSS link doesn't exists when a user
+     * does not have a private key or is not enabled
+     */
+    public function testVerifyPrivateRSSLinkDoesNotExist()
+    {
+        list($req, $uId) = $this->getLoggedInRequest('?unittestMode=1', true);
+
+        $user = $this->us->getUser($uId);
+        $req->setUrl($this->getTestUrl('/' . $user['username']));
+        $response = $req->send();
+        $response_body = $response->getBody();
+        $this->assertNotEquals('', $response_body, 'Response is empty');
+
+        $x = simplexml_load_string($response_body);
+        $ns = $x->getDocNamespaces();
+        $x->registerXPathNamespace('ns', reset($ns));
+
+        $elements = $x->xpath(
+            '//ns:link[@rel="alternate" and @type="application/rss+xml"]'
+        );
+        $this->assertEquals(
+            1, count($elements), 'Number of Links in Head not correct'
+        );
+        $this->assertNotContains('privateKey=', (string)$elements[0]['href']);
+    }//end testVerifyPrivateRSSLinkDoesNotExist
+
 }//end class www_bookmarksTest
 ?>
diff --git a/tests/www/indexTest.php b/tests/www/indexTest.php
new file mode 100644
index 0000000..503fd1f
--- /dev/null
+++ b/tests/www/indexTest.php
@@ -0,0 +1,58 @@
+<?php
+require_once dirname(__FILE__) . '/../prepare.php';
+require_once 'HTTP/Request2.php';
+
+class www_indexTest extends TestBaseApi
+{
+    protected $urlPart = '';
+
+    /**
+     * Test that the private rss feed exists when user is setup
+     * with a private key and is enabled
+     */
+    public function testVerifyPrivateRSSLinkExists()
+    {
+        list($req, $uId) = $this->getLoggedInRequest('?unittestMode=1', true, true);
+
+        $user = $this->us->getUser($uId);
+        $response = $req->send();
+        $response_body = $response->getBody();
+
+        $this->assertNotEquals('', $response_body, 'Response is empty');
+
+        $x = simplexml_load_string($response_body);
+        $ns = $x->getDocNamespaces();
+        $x->registerXPathNamespace('ns', reset($ns));
+
+        $elements = $x->xpath('//ns:link[@rel="alternate" and @type="application/rss+xml"]');
+        $this->assertEquals(2, count($elements), 'Number of Links in Head not correct');
+        $this->assertContains('privateKey=', (string)$elements[1]['href']);
+    }//end testVerifyPrivateRSSLinkExists
+
+
+
+    /**
+     * Test that the private RSS link doesn't exists when a user
+     * does not have a private key, or the private key is not enabled
+     */
+    public function testVerifyPrivateRSSLinkDoesNotExist()
+    {
+        list($req, $uId) = $this->getLoggedInRequest('?unittestMode=1', true);
+
+        $user = $this->us->getUser($uId);
+        $response = $req->send();
+        $response_body = $response->getBody();
+        $this->assertNotEquals('', $response_body, 'Response is empty');
+
+        $x = simplexml_load_string($response_body);
+        $ns = $x->getDocNamespaces();
+        $x->registerXPathNamespace('ns', reset($ns));
+
+        $elements = $x->xpath('//ns:link[@rel="alternate" and @type="application/rss+xml"]');
+        $this->assertEquals(1, count($elements), 'Number of Links in Head not correct');
+        $this->assertNotContains('privateKey=', (string)$elements[0]['href']);
+    }//end testVerifyPrivateRSSLinkDoesNotExist
+
+
+}//end class www_bookmarksTest
+?>
diff --git a/tests/www/rssTest.php b/tests/www/rssTest.php
new file mode 100644
index 0000000..71d0198
--- /dev/null
+++ b/tests/www/rssTest.php
@@ -0,0 +1,151 @@
+<?php
+require_once dirname(__FILE__) . '/../prepare.php';
+require_once 'HTTP/Request2.php';
+
+class www_rssTest extends TestBaseApi
+{
+    protected $urlPart = 'rss.php';
+
+
+    /**
+     * Verifies that the given number of feed items exist in the feed
+     * XML tree.
+     *
+     * @var SimpleXMLElement $simpleXml RSS feed root element
+     * @var integer          $nCount    Number of expected feed items
+     * @var string           $msg       Error message
+     */
+    protected function assertItemCount(
+        SimpleXMLElement $simpleXml, $nCount, $msg = null
+    ) {
+        $this->assertEquals($nCount, count($simpleXml->channel->item), $msg);
+    }
+
+
+
+
+    /**
+     * A private bookmark should not show up in the global rss feed if the
+     * user is not logged in nor passes the private key
+     */
+    public function testAllPrivateBookmarkNotLoggedIn()
+    {
+        list($uId, $username) = $this->addUserData();
+        $this->addBookmark(
+            $uId, null, SemanticScuttle_Model_Bookmark::SPRIVATE
+        );
+
+        $req = $this->getRequest();
+        $response_body = $req->send()->getBody();
+
+        $rss = simplexml_load_string($response_body);
+        $this->assertItemCount($rss, 0, 'I see a private bookmark');
+    }
+
+
+
+    /**
+     * A private bookmark should not show up in the user's rss feed if the
+     * user is not logged in nor passes the private key
+     */
+    public function testUserPrivateBookmarkNotLoggedIn()
+    {
+        list($uId, $username) = $this->addUserData();
+        $this->addBookmark(
+            $uId, null, SemanticScuttle_Model_Bookmark::SPRIVATE
+        );
+
+        $req = $this->getRequest('/' . $username);
+        $response_body = $req->send()->getBody();
+
+        $rss = simplexml_load_string($response_body);
+        $this->assertItemCount($rss, 0, 'I see a private bookmark');
+    }
+
+
+
+
+    /**
+     * Test the global feed by passing the private key
+     */
+    public function testAllPrivateBookmarkWithPrivateKey()
+    {
+        list($uId, $username, $password, $privateKey) = $this->addUserData(
+            null, null, true
+        );
+        $this->addBookmark(
+            $uId, null, SemanticScuttle_Model_Bookmark::SPRIVATE,
+            null, 'private bookmark'
+        );
+
+        $req = $this->getRequest('?privateKey=' . $privateKey);
+        $response_body = $req->send()->getBody();
+
+        $rss = simplexml_load_string($response_body);
+        $this->assertItemCount($rss, 1, 'I miss the private bookmark');
+        $this->assertEquals(
+            'private bookmark', (string)$rss->channel->item[0]->title
+        );
+    }
+
+
+
+    /**
+     * Test the user feed by passing the private key
+     */
+    public function testUserPrivateBookmarkWithPrivateKey()
+    {
+        list($uId, $username, $password, $privateKey) = $this->addUserData(
+            null, null, true
+        );
+        $this->addBookmark(
+            $uId, null, SemanticScuttle_Model_Bookmark::SPRIVATE,
+            null, 'private bookmark'
+        );
+
+        $req = $this->getRequest('/' . $username . '?privateKey=' . $privateKey);
+        $response_body = $req->send()->getBody();
+
+        $rss = simplexml_load_string($response_body);
+        $this->assertItemCount($rss, 1, 'I miss the private bookmark');
+        $this->assertEquals(
+            'private bookmark', (string)$rss->channel->item[0]->title
+        );
+    }
+
+
+
+    /**
+     * Verify that fetching the feed with a private key
+     * does not keep you logged in
+     */
+    public function testUserPrivateKeyDoesNotKeepLoggedYouIn()
+    {
+        list($uId, $username, $password, $privateKey) = $this->addUserData(
+            null, null, true
+        );
+        $this->addBookmark(
+            $uId, null, SemanticScuttle_Model_Bookmark::SPRIVATE,
+            null, 'private bookmark'
+        );
+
+        $req = $this->getRequest('/' . $username . '?privateKey=' . $privateKey);
+        $cookies = $req->setCookieJar()->getCookieJar();
+        $response_body = $req->send()->getBody();
+
+        $rss = simplexml_load_string($response_body);
+        $items = $rss->channel->item;
+
+        $this->assertEquals(1, count($items), 'I miss the private bookmark');
+        $this->assertEquals('private bookmark', (string)$items[0]->title);
+
+        //request the feed again, with the same cookies
+        $req = $this->getRequest('/' . $username);
+        $req->setCookieJar($cookies);
+        $response_body = $req->send()->getBody();
+        $rss = simplexml_load_string($response_body);
+        $this->assertItemCount($rss, 0, 'I still see the private bookmark');
+    }
+
+}//end class www_rssTest
+?>
diff --git a/tests/www/searchTest.php b/tests/www/searchTest.php
index 5dce69d..89af32d 100644
--- a/tests/www/searchTest.php
+++ b/tests/www/searchTest.php
@@ -1,4 +1,6 @@
 <?php
+require_once dirname(__FILE__) . '/../prepare.php';
+require_once 'HTTP/Request2.php';
 
 class www_SearchTest extends TestBaseApi
 {
@@ -65,4 +67,4 @@ class www_SearchTest extends TestBaseApi
 
 }
 
-?>
\ No newline at end of file
+?>