hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve conflict

Browse Source
This commit is contained in:
Mike Ng
2018-01-08 15:57:13 +04:00
parent bddc3781ba
commit 30f49bdd35
27 changed files with 564 additions and 467 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/Alchemy/Tests/Phrasea/Controller/Admin/SubdefsTest.php
View File

@@ -37,9 +37,9 @@ class SubdefsTest extends \PhraseanetAuthenticatedWebTestCase
{
$name = $this->getSubdefName();
self::$DI['client']->request("POST", "/admin/subdefs/" . $this->databox_id . "/", ['add_subdef' => [
'class' => 'thumbnail',
'name' => $name,
'group' => 'image'
'class' => 'thumbnail',
'name' => $name,
'group' => 'image'
]]);
$this->assertTrue(self::$DI['client']->getResponse()->isRedirect());
$app = $this->getApplication();
@@ -65,7 +65,7 @@ class SubdefsTest extends \PhraseanetAuthenticatedWebTestCase
$name = $this->getSubdefName();
$subdefs->add_subdef("image", $name, "thumbnail", "image", "1280px JPG (preview Phraseanet)");
self::$DI['client']->request("POST", "/admin/subdefs/" . $this->databox_id . "/"
, ['subdefs' => [
, ['subdefs' => [
'image_' . $name
]
, 'image_' . $name . '_class' => 'thumbnail'

16
tests/Alchemy/Tests/Phrasea/Controller/Prod/ShareTest.php
View File

@@ -23,17 +23,19 @@ class ShareTest extends \PhraseanetAuthenticatedWebTestCase
*/
public function testRouteSlashALL()
{
$this->_RouteSlash("all", [0=>true, 1=>true, 2=>true, 3=>true]);
$this->_RouteSlash("all", [0 => true, 1 => true, 2 => true, 3 => true]);
}
public function testRouteSlashPublishers()
{
$this->_RouteSlash("publishers", [0=>false, 1=>true, 2=>false, 3=>true]);
$this->_RouteSlash("publishers", [0 => false, 1 => true, 2 => false, 3 => true]);
}
public function testRouteSlashNone()
{
$this->_RouteSlash("none", [0=>false, 1=>false, 2=>false, 3=>false]);
$this->_RouteSlash("none", [0 => false, 1 => false, 2 => false, 3 => false]);
}
private function _RouteSlash($setting, $expected)
{
$app = $this->getApplication();
@@ -49,25 +51,27 @@ class ShareTest extends \PhraseanetAuthenticatedWebTestCase
case ['registry', 'actions', 'social-tools']:
return $setting;
}
return $_conf->get($param, $default);
}));
$result = [];
foreach($expected as $flags=>$v) {
foreach ($expected as $flags => $v) {
$stubbedACL = $this->stubACL();
// "has_right_on_sbas" IS checked by the route->before(), the url will return 403
$stubbedACL->expects($this->any())
->method('has_right_on_sbas')
->will($this->returnValue(($flags & 1) ? true:false));
->will($this->returnValue(($flags & 1) ? true : false));
// but "has_access_to_subdef" IS NOT checked (the url will return a 200 with a message "no subdef to share")
$stubbedACL->expects($this->any())
->method('has_access_to_subdef')
->will($this->returnValue(($flags & 2) ? true:false));
->will($this->returnValue(($flags & 2) ? true : false));
$url = sprintf('/prod/share/record/%d/%d/', self::$DI['record_1']->get_base_id(), self::$DI['record_1']->get_record_id());
self::$DI['client']->request('GET', $url);
$result[$flags] = self::$DI['client']->getResponse()->isOk();
}
$this->assertEquals($expected, $result);
}
/**
* @covers Alchemy\Phrasea\Controller\Prod\Share::shareRecord
*/