summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Weiske <cweiske@cweiske.de>2011-04-06 09:52:02 +0200
committerChristian Weiske <cweiske@cweiske.de>2011-04-06 09:52:02 +0200
commit200cb1d3c54dfaae54d26c0d51f6086435bcee8e (patch)
treee92ef6a72d258343928211f257fce69893738e29
parent3306261b3ee6ee3df2d67f2f87b4d8afafd55a53 (diff)
downloadsemanticscuttle-200cb1d3c54dfaae54d26c0d51f6086435bcee8e.tar.gz
semanticscuttle-200cb1d3c54dfaae54d26c0d51f6086435bcee8e.tar.bz2
move privacy tests for api/post_add to the correct location
-rw-r--r--tests/Api/PostsAddTest.php36
-rw-r--r--tests/BookmarkTest.php13
2 files changed, 36 insertions, 13 deletions
diff --git a/tests/Api/PostsAddTest.php b/tests/Api/PostsAddTest.php
index 226a7c9..f3bb31e 100644
--- a/tests/Api/PostsAddTest.php
+++ b/tests/Api/PostsAddTest.php
@@ -420,6 +420,42 @@ TXT;
$this->assertEquals(1, $data['total']);
$this->assertEquals($title2, $data['bookmarks'][0]['bTitle']);
}
+
+ public function testDefaultPrivacyPrivate()
+ {
+ $this->setUnittestConfig(
+ array('defaults' => array('privacy' => 2))
+ );
+ list($req, $uId) = $this->getAuthRequest('?unittestMode=1');
+ $req->setMethod(HTTP_Request2::METHOD_POST);
+ $req->addPostParameter('url', 'http://www.testdefaultprivacyposts_add1.com');
+ $req->addPostParameter('description', 'Test bookmark 1 for default privacy.');
+ $req->send();
+
+ $this->us->setCurrentUserId($uId);
+ $bms = $this->bs->getBookmarks(0, null, $uId);
+ $this->assertEquals(1, count($bms['bookmarks']));
+ $bm = reset($bms['bookmarks']);
+ $this->assertEquals('2', $bm['bStatus']);
+ }
+
+ public function testDefaultPrivacyPublic()
+ {
+ $this->setUnittestConfig(
+ array('defaults' => array('privacy' => 0))
+ );
+ list($req, $uId) = $this->getAuthRequest('?unittestMode=1');
+ $req->setMethod(HTTP_Request2::METHOD_POST);
+ $req->addPostParameter('url', 'http://www.testdefaultprivacyposts_add1.com');
+ $req->addPostParameter('description', 'Test bookmark 1 for default privacy.');
+ $req->send();
+
+ $this->us->setCurrentUserId($uId);
+ $bms = $this->bs->getBookmarks(0, null, $uId);
+ $this->assertEquals(1, count($bms['bookmarks']));
+ $bm = reset($bms['bookmarks']);
+ $this->assertEquals('0', $bm['bStatus']);
+ }
}
if (PHPUnit_MAIN_METHOD == 'Api_PostsAddTest::main') {
diff --git a/tests/BookmarkTest.php b/tests/BookmarkTest.php
index e6f2b26..ad1cb48 100644
--- a/tests/BookmarkTest.php
+++ b/tests/BookmarkTest.php
@@ -1357,19 +1357,6 @@ class BookmarkTest extends TestBase
require_once dirname(__FILE__) . '/../data/config.php';
$this->bs->deleteAll();
$this->us->deleteAll();
- $request = new HTTP_Request2('http://localhost/api/posts_add.php', HTTP_Request2::METHOD_POST);
- $dpuid = $this->addUser('dpuser', 'dpuserpassword');
- $request->setAuth('dpuser', 'dpuserpassword');
- $request->addPostParameter('url', 'http://www.testdefaultprivacyposts_add1.com');
- $request->addPostParameter('description', 'Test bookmark 1 for default privacy.');
- $request->send();
- $bm = $this->bs->getBookmark('1');
- $this->assertEquals('2', $bm['bStatus']);
-
- $request->addPostParameter('url', 'http://www.testdefaultprivacyposts_add2.com');
- $request->addPostParameter('description', 'Test bookmark 2 for default privacy.');
- $request->addPostParameter('status', '0');
- $request->send();
$request = new HTTP_Request2('http://localhost/edit.php/2', HTTP_Request2::METHOD_POST);
$testcookiekey = md5($GLOBALS['dbname'].$GLOBALS['tableprefix']).'-login';