Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-10-13 16:40:16 +0300
committerThomas Müller <thomas.mueller@tmit.eu>2015-10-13 16:40:16 +0300
commit9444e07e800cbb2d730547198c27f91cf997f70a (patch)
tree6728ecf27a3976f04151198d885d67809041037c
parentf69161ae87f522edf84bb68ce7ab7e054d3af288 (diff)
parentd78b4d0e72d9738e1d4e7a1baf2f9681a0ae3b91 (diff)
Merge pull request #19732 from owncloud/make-sure-sharing-extends-the-testcase
Make sure all sharing tests extend the testcase
-rw-r--r--apps/files_sharing/tests/controller/sharecontroller.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/apps/files_sharing/tests/controller/sharecontroller.php b/apps/files_sharing/tests/controller/sharecontroller.php
index 6e61dbb2488..11e0e236e7b 100644
--- a/apps/files_sharing/tests/controller/sharecontroller.php
+++ b/apps/files_sharing/tests/controller/sharecontroller.php
@@ -25,7 +25,7 @@ use OC\URLGenerator;
/**
* @package OCA\Files_Sharing\Controllers
*/
-class ShareControllerTest extends \PHPUnit_Framework_TestCase {
+class ShareControllerTest extends \Test\TestCase {
/** @var IAppContainer */
private $container;
@@ -41,6 +41,8 @@ class ShareControllerTest extends \PHPUnit_Framework_TestCase {
private $urlGenerator;
protected function setUp() {
+ parent::setUp();
+
$app = new Application();
$this->container = $app->getContainer();
$this->container['Config'] = $this->getMockBuilder('\OCP\IConfig')
@@ -92,6 +94,8 @@ class ShareControllerTest extends \PHPUnit_Framework_TestCase {
// Set old user
\OC_User::setUserId($this->oldUser);
\OC_Util::setupFS($this->oldUser);
+
+ parent::tearDown();
}
public function testShowAuthenticate() {