make import test easier
This commit is contained in:
parent
6f04c888bf
commit
79e3f4e121
1 changed files with 5 additions and 10 deletions
|
@ -514,7 +514,7 @@ TXT;
|
|||
$this->setUnittestConfig(
|
||||
array('defaults' => array('privacy' => 1))
|
||||
);
|
||||
list($req, $uId) = $this->getLoggedInRequest('?unittestMode=1');
|
||||
list($req, $uId) = $this->getLoggedInRequest();
|
||||
$req->setMethod(HTTP_Request2::METHOD_POST);
|
||||
$req->setUrl($GLOBALS['unittestUrl'] . 'importNetscape.php' . '?unittestMode=1');
|
||||
$req->addUpload('userfile', dirname(__FILE__) . '/../data/BookmarkTest_netscapebookmarks.html');
|
||||
|
@ -538,18 +538,13 @@ TXT;
|
|||
$this->setUnittestConfig(
|
||||
array('defaults' => array('privacy' => 2))
|
||||
);
|
||||
list($req, $uId) = $this->getAuthRequest('?unittestMode=1');
|
||||
list($req, $uId) = $this->getLoggedInRequest();
|
||||
$req->setMethod(HTTP_Request2::METHOD_POST);
|
||||
$req->setUrl($GLOBALS['unittestUrl'] . 'import.php' . '?unittestMode=1');
|
||||
$testcookiekey = md5($GLOBALS['dbname'].$GLOBALS['tableprefix']).'-login';
|
||||
$userinfo = $this->us->getUser($uId);
|
||||
$testcookiepassword = $userinfo['password'];
|
||||
$testusername = $userinfo['username'];
|
||||
$testcookievalue = $uId . ':' . md5($testusername . $testcookiepassword);
|
||||
$req->setCookieJar(true);
|
||||
$req->addCookie($testcookiekey, $testcookievalue);
|
||||
$req->addUpload('userfile', dirname(__FILE__) . '/../data/BookmarkTest_deliciousbookmarks.xml');
|
||||
$req->send();
|
||||
$res = $req->send();
|
||||
$this->assertEquals(302, $res->getStatus(), 'Bookmark import failed');
|
||||
|
||||
$this->us->setCurrentUserId($uId);
|
||||
$bms = $this->bs->getBookmarks(0, null, $uId);
|
||||
$this->assertEquals(3, count($bms['bookmarks']));
|
||||
|
|
Loading…
Reference in a new issue