Fixes config issue with tests.

bombayworks · May 5, 2015 · b749117 · b749117
1 parent 9a5770b
commit b749117
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 49 deletions.
diff --git a/test/Curry/Tests/CmsTest.php b/test/Curry/Tests/CmsTest.php
@@ -14,26 +14,23 @@ public static function setUpBeforeClass()
 
 		self::$fixturesDirectory = realpath(dirname(dirname(__DIR__)).'/fixtures');
 		$app = App::create(array (
-				'curry' =>
-				array (
-					'name' => 'Curry Unit Tests',
-					'adminEmail' => 'info@currycms.com',
-					'cache' => array('method' => 'none'),
-					'pageCache' => false,
-					'autoBackup' => false,
-					'projectPath' => self::$fixturesDirectory,
-					'migrationVersion' => App::MIGRATION_VERSION,
-					'template' => array(
-						'root' => self::$fixturesDirectory.'/templates',
-						'options' => array(
-							'cache' => false,
-						),
-					),
-					'propel' => array(
-						'conf' => self::$fixturesDirectory.'/propel/build/conf/curry-conf.php',
-						'projectClassPath' => self::$fixturesDirectory.'/propel/build/classes',
+				'name' => 'Curry Unit Tests',
+				'adminEmail' => 'info@currycms.com',
+				'cache' => array('method' => 'none'),
+				'pageCache' => false,
+				'autoBackup' => false,
+				'projectPath' => self::$fixturesDirectory,
+				'migrationVersion' => App::MIGRATION_VERSION,
+				'template' => array(
+					'root' => self::$fixturesDirectory.'/templates',
+					'options' => array(
+						'cache' => false,
 					),
 				),
+				'propel' => array(
+					'conf' => self::$fixturesDirectory.'/propel/build/conf/curry-conf.php',
+					'projectClassPath' => self::$fixturesDirectory.'/propel/build/classes',
+				),
 			));
 		$app->boot();
 
@@ -50,17 +47,12 @@ public static function setUpBeforeClass()
 			throw $e;
 		}
 
-		$setup = new \Curry_Backend_Setup($app);
+		$setup = new \Curry\Backend\Setup($app);
 		$setup->saveConfiguration(array(
-				'template' => 'empty',
 				'admin' => array(
 					'username' => 'admin',
 					'password' => 'admin',
 				),
-				'user' => array(
-					'username' => 'user',
-					'password' => 'user',
-				)
 			));
 		$app->cache->clean();
 	}

diff --git a/test/fixtures/config.php b/test/fixtures/config.php
diff --git a/test/fixtures/hooks.php b/test/fixtures/hooks.php
diff --git a/test/fixtures/templates/Root.html → test/fixtures/templates/Root.html.twig b/test/fixtures/templates/Root.html → test/fixtures/templates/Root.html.twig