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 '3.8'

Browse Source 
Conflicts:
	.travis.yml
	bin/developer
	build-env.sh
	lib/Alchemy/Phrasea/Application.php
	lib/Alchemy/Phrasea/Core/Provider/LocaleServiceProvider.php
	tests/Alchemy/Tests/Phrasea/Command/Setup/XSendFileMappingGeneratorTest.php
	tests/Alchemy/Tests/Phrasea/Controller/SetupTest.php
	tests/Alchemy/Tests/Phrasea/Form/Login/PhraseaRegisterFormTest.php
This commit is contained in:
Nicolas Le Goff
2014-08-19 15:30:25 +02:00
parent cbd0bb0558 6ee8d2bab3
commit 46da7be65d
15 changed files with 331 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
tests/Alchemy/Tests/Phrasea/Controller/SetupTest.php
View File

@@ -32,10 +32,10 @@ class SetupTest extends \PhraseanetWebTestCase
public function testRouteSlashWhenInstalled()
{
$this->app['phraseanet.configuration-tester']->expects($this->exactly(1))
$this->app['phraseanet.configuration-tester']->expects($this->any())
->method('isInstalled')
->will($this->returnValue(true));
$this->app['phraseanet.configuration-tester']->expects($this->once())
$this->app['phraseanet.configuration-tester']->expects($this->any())
->method('isBlank')
->will($this->returnValue(false));
@@ -48,10 +48,10 @@ class SetupTest extends \PhraseanetWebTestCase
public function testRouteInstructionsWhenUpgradeRequired()
{
$this->app['phraseanet.configuration-tester']->expects($this->exactly(1))
$this->app['phraseanet.configuration-tester']->expects($this->any())
->method('isInstalled')
->will($this->returnValue(false));
$this->app['phraseanet.configuration-tester']->expects($this->once())
$this->app['phraseanet.configuration-tester']->expects($this->any())
->method('isBlank')
->will($this->returnValue(false));
@@ -66,7 +66,7 @@ class SetupTest extends \PhraseanetWebTestCase
{
$client = $this->createClient();
$this->app['phraseanet.configuration-tester']->expects($this->once())
$this->app['phraseanet.configuration-tester']->expects($this->any())
->method('isBlank')
->will($this->returnValue(true));
@@ -79,7 +79,7 @@ class SetupTest extends \PhraseanetWebTestCase
{
$client = $this->createClient();
$this->app['phraseanet.configuration-tester']->expects($this->once())
$this->app['phraseanet.configuration-tester']->expects($this->any())
->method('isBlank')
->will($this->returnValue(true));
@@ -103,30 +103,25 @@ class SetupTest extends \PhraseanetWebTestCase
->getMock();
$user = $this->createUserMock();
$user->expects($this->once())
->method('getId')
->will($this->returnValue(self::$DI['user']->getId()));
$acl = $this->getMockBuilder('ACL')
->disableOriginalConstructor()
->getMock();
$acl->expects($this->once())
->method('get_granted_sbas')
->will($this->returnValue([]));
$aclProvider = $this->getMockBuilder('Alchemy\Phrasea\Authentication\ACLProvider')
->disableOriginalConstructor()
->getMock();
$aclProvider->expects($this->any())
->method('get')
->will($this->returnValue($acl));
$this->app['acl'] = $aclProvider;
$this->app['phraseanet.installer']->expects($this->once())
->method('install')
->will($this->returnValue($user));
$authenticator = $this->getMockBuilder('Alchemy\Phrasea\Authentication\Authenticator')
->disableOriginalConstructor()
->getMock();
$session = $this->getMock('Entities\Session');
$authenticator->expects($this->once())
->method('openAccount')
->with($this->equalTo($user))
->will($this->returnValue($session));
$this->app['authentication'] = $authenticator;
$client = $this->createClient();
$settings = Yaml::parse(file_get_contents(__DIR__ . '/../../../../../hudson/InstallDBs.yml'));
@@ -134,14 +129,12 @@ class SetupTest extends \PhraseanetWebTestCase
$host = isset($settings['host']) ? $settings['host'] : 'localhost';
$port = isset($settings['port']) ? $settings['port'] : '3306';
$MySQLuser = isset($settings['user']) ? $settings['user'] : 'root';
$MySQLpassword = isset($settings['password']) ? $settings['password'] : '';
$abName = isset($settings['applicationBox']) ? $settings['applicationBox'] : null;
$dbName = isset($settings['dataBox']) ? $settings['dataBox'] : null;
$user = isset($settings['user']) ? $settings['user'] : 'root';
$password = isset($settings['password']) ? $settings['password'] : '';
$abName = isset($settings['ab_name']) ? $settings['ab_name'] : null;
$dbName = isset($settings['db_name']) ? $settings['db_name'] : null;
$dataDir = sys_get_temp_dir() . '/datainstall/';
$params = [
$params = array(
'email' => 'user@example.org',
'password' => 'prètty%%password',
'binary_xpdf' => '/path/to/xpdf',
@@ -156,22 +149,22 @@ class SetupTest extends \PhraseanetWebTestCase
'binary_composite' => '/path/to/composite',
'binary_convert' => '/path/to/convert',
'binary_php' => '/path/to/php',
'datapath_noweb' => $dataDir . 'noweb',
'datapath_noweb' => sys_get_temp_dir() . '/datainstall/noweb',
'ab_hostname' => $host,
'ab_port' => $port,
'ab_user' => $MySQLuser,
'ab_password' => $MySQLpassword,
'ab_user' => $user,
'ab_password' => $password,
'ab_name' => $abName,
'db_name' => $dbName,
'db_template' => 'en-simple',
'create_task' => [],
'db_template' => 'en',
'create_task' => array(),
'binary_phraseanet_indexer' => '/path/to/phraseanet_indexer',
];
);
$client->request('POST', '/setup/installer/install/', $params);
$response = $client->getResponse();
$this->assertEquals(302, $response->getStatusCode());
$this->assertTrue(false === strpos($response->headers->get('location'), '/setup/installer/'));
$this->assertTrue(false === strpos($response->headers->get('location'), '/setup/installer/'), $response);
}
public function testSetupProvidesPathTest()