wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #15158 from owncloud/fix-failing-master

Browse source 
Fix failing master unit tests
This commit is contained in:
Robin Appelman 2015-03-24 17:54:11 +01:00
commit 1bd141b655
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/files_sharing/lib/external/manager.php vendored
View file

@ -368,7 +368,7 @@ class Manager {
$query = 'SELECT * FROM `*PREFIX*share_external` WHERE `user` = ?';
$parameters = [$this->uid];
if (!is_null($accepted)) {
$query .= 'AND `accepted` = ?';
$query .= ' AND `accepted` = ?';
$parameters[] = (int) $accepted;
}
$query .= ' ORDER BY `id` ASC';

17
apps/files_sharing/tests/external/manager.php vendored
View file

@ -21,7 +21,7 @@
namespace OCA\Files_sharing\Tests\External;
use OC\Files\Storage\StorageFactory;
use Test\TestCase;
use OCA\Files_Sharing\Tests\TestCase;
class Manager extends TestCase {
private $uid;
@ -37,14 +37,23 @@ class Manager extends TestCase {
private $instance;
public function setUp() {
$this->uid = uniqid();
parent::setUp();
$this->uid = $this->getUniqueID('user');
$this->mountManager = new \OC\Files\Mount\Manager();
$this->instance = new \OCA\Files_Sharing\External\Manager(\OC::$server->getDatabaseConnection(),
$this->mountManager, new StorageFactory(), \OC::$server->getHTTPHelper(), $this->uid);
$this->instance = new \OCA\Files_Sharing\External\Manager(
\OC::$server->getDatabaseConnection(),
$this->mountManager,
new StorageFactory(),
$this->getMockBuilder('\OC\HTTPHelper')->disableOriginalConstructor()->getMock(),
$this->uid
);
}
public function tearDown() {
$this->instance->removeUserShares($this->uid);
parent::tearDown();
}
private function getFullPath($path) {