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

Merge branch 4.0

Browse Source
This commit is contained in:
Thibaud Fabre
2016-12-05 15:26:48 +01:00
parent f6700fbe12
commit b5bbb1851f
315 changed files with 6552 additions and 29445 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/Alchemy/Tests/Phrasea/Controller/Admin/FieldsTest.php
View File

@@ -154,7 +154,7 @@ class FieldsTest extends \PhraseanetAuthenticatedWebTestCase
]];
foreach ($fields as $fieldData) {
$field = \databox_field::create($this->getApplication(), $databox, $fieldData['name'], $fieldData['multi']);
$field = \databox_field::create($this->getApplication(), $databox, $fieldData['name']);
$field
->set_thumbtitle($fieldData['thumbtitle'])
->set_tag(\databox_field::loadClassFromTagName($fieldData['tag']))
@@ -167,7 +167,8 @@ class FieldsTest extends \PhraseanetAuthenticatedWebTestCase
->set_tbranch($fieldData['tbranch'])
->set_report($fieldData['report'])
->setVocabularyControl(null)
->setVocabularyRestricted(false);
->setVocabularyRestricted(false)
->set_multi($fieldData['multi']);
$field->save();
$fieldObjects[] = $field;
}
@@ -271,7 +272,7 @@ class FieldsTest extends \PhraseanetAuthenticatedWebTestCase
$app = $this->getApplication();
$databox = $this->getFirstDatabox($app);
$field = \databox_field::create($app, $databox, 'testfield' . mt_rand(), false);
$field = \databox_field::create($app, $databox, 'testfield' . mt_rand());
$data = $field->toArray();
@@ -289,7 +290,7 @@ class FieldsTest extends \PhraseanetAuthenticatedWebTestCase
$app = $this->getApplication();
$databox = $this->getFirstDatabox($app);
$field = \databox_field::create($app, $databox, 'testfield' . mt_rand(), false);
$field = \databox_field::create($app, $databox, 'testfield' . mt_rand());
$data = $field->toArray();
@@ -308,7 +309,7 @@ class FieldsTest extends \PhraseanetAuthenticatedWebTestCase
$app = $this->getApplication();
$databox = $this->getFirstDatabox($app);
$field = \databox_field::create($app, $databox, 'testfield' . mt_rand(), false);
$field = \databox_field::create($app, $databox, 'testfield' . mt_rand());
$fieldId = $field->get_id();
$data = $field->toArray();

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

@@ -94,8 +94,7 @@ class SubdefsTest extends \PhraseanetAuthenticatedWebTestCase
$subdefs = new \databox_subdefsStructure($app->findDataboxById($this->databox_id), $app['translator']);
$subdef = $subdefs->get_subdef("image", $name);
/* @var $subdef \databox_subdef */
$this->assertFalse($subdef->is_downloadable());
$this->assertFalse($subdef->isDownloadable());
$options = $subdef->getOptions();

4
tests/Alchemy/Tests/Phrasea/Controller/Prod/FeedTest.php
View File

@@ -240,7 +240,7 @@ class FeedTest extends \PhraseanetAuthenticatedWebTestCase
, "subtitle" => "cat"
, "author_name" => "bird"
, "author_mail" => "mouse"
, 'sorted_lst' => self::$DI['record_1']->get_serialize_key() . ";" . self::$DI['record_2']->get_serialize_key() . ";12345;" . "unknow_unknow"
, 'lst' => self::$DI['record_1']->get_serialize_key() . ";" . self::$DI['record_2']->get_serialize_key() . ";12345;" . "unknow_unknow"
];
self::$DI['client']->request('POST', '/prod/feeds/entry/' . $entry->getId() . '/update/', $params);
@@ -281,7 +281,7 @@ class FeedTest extends \PhraseanetAuthenticatedWebTestCase
"title" => $entry->getTitle(),
"author_name" => $entry->getAuthorName(),
"author_mail" => $entry->getAuthorEmail(),
'sorted_lst' => $item1->getId() . '_' . $item2->getOrd() . ';'
'lst' => $item1->getId() . '_' . $item2->getOrd() . ';'
. $item2->getId() . '_' . $item1->getOrd()
];

1662
tests/Alchemy/Tests/Phrasea/Controller/Root/LoginTest.php
View File

File diff suppressed because it is too large Load Diff