aboutsummaryrefslogtreecommitdiffstats
path: root/tests/lib/httphelper.php
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2014-12-04 19:51:04 +0100
committerBjoern Schiessle <schiessle@owncloud.com>2014-12-19 15:20:24 +0100
commit24993280edcf66f9daa5a5e82428fefef4a3ab56 (patch)
treeede7ca0417af874185588a845fe5f7f754076f60 /tests/lib/httphelper.php
parentf671b232cc122cdb8e993c8b35bd5419b32a9ae4 (diff)
downloadnextcloud-server-24993280edcf66f9daa5a5e82428fefef4a3ab56.tar.gz
nextcloud-server-24993280edcf66f9daa5a5e82428fefef4a3ab56.zip
Next step in server-to-server sharing next generation, see #12285
Beside some small improvements and bug fixes this will probably the final state for OC8. To test this you need to set up two ownCloud instances. Let's say: URL: myPC/firstOwnCloud user: user1 URL: myPC/secondOwnCloud user: user2 Now user1 can share a file with user2 by entering the username and the URL to the second ownCloud to the share-drop-down, in this case "user2@myPC/secondOwnCloud". The next time user2 login he will get a notification that he received a server-to-server share with the option to accept/decline it. If he accept it the share will be mounted. In both cases a event will be send back to user1 and add a notification to the activity stream that the share was accepted/declined. If user1 decides to unshare the file again from user2 the share will automatically be removed from the second ownCloud server and user2 will see a notification in his activity stream that user1@myPC/firstOwnCloud has unshared the file/folder from him.
Diffstat (limited to 'tests/lib/httphelper.php')
-rw-r--r--tests/lib/httphelper.php24
1 files changed, 23 insertions, 1 deletions
diff --git a/tests/lib/httphelper.php b/tests/lib/httphelper.php
index 1cc4232ab4b..48d6543f1f2 100644
--- a/tests/lib/httphelper.php
+++ b/tests/lib/httphelper.php
@@ -12,14 +12,17 @@ class TestHTTPHelper extends \Test\TestCase {
private $config;
/** @var \OC\HTTPHelper */
private $httpHelperMock;
+ /** @var \OC\Security\CertificateManager */
+ private $certificateManager;
protected function setUp() {
parent::setUp();
$this->config = $this->getMockBuilder('\OCP\IConfig')
->disableOriginalConstructor()->getMock();
+ $this->certificateManager = $this->getMock('\OCP\ICertificateManager');
$this->httpHelperMock = $this->getMockBuilder('\OC\HTTPHelper')
- ->setConstructorArgs(array($this->config))
+ ->setConstructorArgs(array($this->config, $this->certificateManager))
->setMethods(array('getHeaders'))
->getMock();
}
@@ -87,4 +90,23 @@ class TestHTTPHelper extends \Test\TestCase {
$this->assertSame($expected, $this->httpHelperMock->isHTTPURL($url));
}
+
+ /**
+ * @dataProvider postParameters
+ */
+ public function testassemblePostParameters($parameterList, $expectedResult) {
+ $helper = \OC::$server->getHTTPHelper();
+ $result = \Test_Helper::invokePrivate($helper, 'assemblePostParameters', array($parameterList));
+ $this->assertSame($expectedResult, $result);
+ }
+
+ public function postParameters() {
+ return array(
+ array(array('k1' => 'v1'), 'k1=v1'),
+ array(array('k1' => 'v1', 'k2' => 'v2'), 'k1=v1&k2=v2'),
+ array(array(), ''),
+ );
+ }
+
+
}