fixing up some tests, set travis email notifications to false

infinitas · Jun 22, 2012 · c38b123 · c38b123
1 parent da89ae4
commit c38b123
Show file tree

Hide file tree

Showing 12 changed files with 476 additions and 31 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -82,4 +82,5 @@ script:
   - Console/cake test app AllTests
 
 notifications:
-  irc: "irc.freenode.org#infinitas"
+  irc: "irc.freenode.org#infinitas"
+  email: false
diff --git a/Core/Configs/Test/Case/Controller/ConfigsControllerTest.php b/Core/Configs/Test/Case/Controller/ConfigsControllerTest.php
@@ -11,6 +11,8 @@ function redirect($url, $status = null, $exit = true) {
 	}
 
 	class ConfigsControllerTest extends CakeTestCase {
+		public $fixtures = array('plugin.configs.config');
+
 		function startTest() {
 			$this->Configs = new TestConfigsController();
 			$this->Configs->constructClasses();

diff --git a/Core/Contents/Test/Case/Controller/GlobalCategoriesControllerTest.php b/Core/Contents/Test/Case/Controller/GlobalCategoriesControllerTest.php
@@ -11,6 +11,9 @@ function redirect($url, $status = null, $exit = true) {
 	}
 
 	class GlobalCategoriesControllerTest extends CakeTestCase {
+
+		public $fixtures = array('plugin.configs.config');
+
 		function startTest() {
 			$this->Categories = new TestCategoriesController();
 			$this->Categories->constructClasses();

diff --git a/Core/Contents/Test/Case/Controller/GlobalTagsControllerTest.php b/Core/Contents/Test/Case/Controller/GlobalTagsControllerTest.php
@@ -29,7 +29,7 @@ class TestTagsController extends GlobalTagsController {
 
 	public $uses = array('Contents.GlobalTag');
 
-	public $components = array('Paginator');
+	public $components = array('Paginator', 'Libs.InfinitasActions');
 /**
  * Auto render
  *
@@ -89,8 +89,11 @@ public function startTest() {
 		$this->GlobalTags = new TestTagsController(new CakeRequest('controller_posts/admin_index'));
 		$this->GlobalTags->params = array(
 			'named' => array(),
-			'url' => array());
+			'url' => array(),
+			'pass' => array()
+		);
 		$this->GlobalTags->constructClasses();
+		$this->GlobalTags->InfinitasActions->initialize($this->GlobalTags);
 	}
 
 /**
@@ -132,6 +135,7 @@ public function testAdminIndex() {
  * @access public
  */
 	public function testAdminAdd() {
+		$this->GlobalTags->request->params['action'] = 'admin_add';
 		$this->GlobalTags->request->data = array(
 			'Tag' => array(
 				'tags' => 'tag1, tag2, tag3'));
@@ -148,6 +152,8 @@ public function testAdminAdd() {
  * @access public
  */
 	public function testAdminEdit() {
+		$this->GlobalTags->request->params['action'] = 'admin_edit';
+		$this->GlobalTags->request->params['pass'] = array(1);
 		$this->GlobalTags->admin_edit(1);
 		$result = $this->GlobalTags->request->data;
 		$expected = array(

diff --git a/Core/Libs/Controller/Component/InfinitasActionsComponent.php b/Core/Libs/Controller/Component/InfinitasActionsComponent.php
@@ -69,7 +69,7 @@ public function actionAdminGetActions() {
 				$this->Controller->set('json', array('error'));
 				return;
 			}
-			
+
 			$this->Controller->set(
 				'json',
 				$this->Controller->{$this->Controller->modelClass}->getActions(
@@ -92,7 +92,7 @@ public function actionAdminGetRecords() {
 				$this->Controller->set('json', array('error'));
 				return;
 			}
-			
+
 			$this->Controller->set(
 				'json',
 				$this->Controller->{$this->Controller->modelClass}->getRecords(
@@ -101,7 +101,7 @@ public function actionAdminGetRecords() {
 				)
 			);
 		}
-		
+
 		/**
 		 * @brief Simple Admin add method.
 		 *
@@ -119,11 +119,11 @@ public function actionAdminGetRecords() {
 		public function actionAdminAdd() {
 			if (!empty($this->Controller->request->data)) {
 				$this->Controller->{$this->Controller->modelClass}->create();
-				
+
 				if ($this->Controller->{$this->Controller->modelClass}->saveAll($this->Controller->request->data)) {
 					$this->Controller->notice('saved');
 				}
-				
+
 				$this->Controller->notice('not_saved');
 			}
 
@@ -154,7 +154,7 @@ public function actionAdminEdit($id = null, $query = array()) {
 				if ($this->Controller->{$this->Controller->modelClass}->saveAll($this->Controller->request->data)) {
 					$this->Controller->notice('saved');
 				}
-				
+
 				$this->Controller->notice('not_saved');
 			}
 
@@ -208,10 +208,10 @@ public function actionAdminPreview($id = null) {
 			$this->Controller->set($varName, $$varName);
 			$this->Controller->request->params['admin'] = false;
 			$this->Controller->layout = 'front';
-			
+
 			$this->Controller->render('view');
 		}
-		
+
 		public function actionAdminExport($id = null) {
 			$this->Controller->notice(
 				__d($this->Controller->request->params['plugin'], 'Export is currently disabled'),
@@ -291,7 +291,7 @@ public function actionAdminReorder($id = null) {
 						$redirectConfig
 					);
 				}
-				
+
 				$this->Controller->Infinitas->orderedMove();
 			}
 
@@ -302,7 +302,7 @@ public function actionAdminReorder($id = null) {
 						$redirectConfig
 					);
 				}
-				
+
 				$this->Controller->Infinitas->treeMove($this->Controller->request->params['named']['direction']);
 			}
 

diff --git a/Core/Libs/Controller/Component/InfinitasComponent.php b/Core/Libs/Controller/Component/InfinitasComponent.php
@@ -288,18 +288,18 @@ public function treeMove($direction) {
 					if (!$this->Controller->{$model}->moveUp($check[$model]['id'], abs(1))) {
 						$message = __('Unable to move the record up');
 					}
-					
+
 					else {
 						$this->Controller->{$model}->afterSave(false);
 					}
 					break;
-					
+
 				case 'down':
 					$message = __('The record was moved down');
 					if (!$this->Controller->{$model}->moveDown($check[$model]['id'], abs(1))) {
 						$message = __('Unable to move the record down');
 					}
-					
+
 					else {
 						$this->Controller->{$model}->afterSave(false);
 					}
@@ -321,7 +321,7 @@ public function treeMove($direction) {
 		 */
 		public function orderedMove() {
 			$modelName = $this->Controller->modelClass;
-			
+
 			$orderable = isset($this->Controller->{$modelName}->actsAs['Libs.Sequence']['groupFields']) &&
 				!empty($this->Controller->{$modelName}->actsAs['Libs.Sequence']['groupFields']);
 

diff --git a/Core/Libs/Test/Case/Model/Behavior/InfinitasTest.php b/Core/Libs/Test/Case/Model/Behavior/InfinitasTest.php
@@ -1,8 +1,8 @@
-	<?php
+<?php
 	/* Infinitas Test cases generated on: 2010-03-13 14:03:31 : 1268484451*/
 	App::uses('InfinitasBehavior', 'Libs.Model/Behavior');
 	App::uses('Route', 'Routes.Model');
-	
+
 	class RouteTest1 extends Route {
 		public $useDbConfig = 'test';
 
@@ -36,10 +36,10 @@ public function setUp() {
 			$this->expectError(true);
 			$this->AppModel = new AppModel(array('table' => false));
 		}
-		
+
 		public function tearDown() {
 			parent::tearDown();
-			
+
 			unset($this->Infinitas);
 		}
 

diff --git a/Core/Libs/Test/Case/Model/Behavior/LockableTest.php b/Core/Libs/Test/Case/Model/Behavior/LockableTest.php
@@ -1,5 +1,4 @@
-	<?php
-	App::import('Model', 'Cms.Content');
+<?php
 	class LockableContent extends CakeTestModel{
 		public $useDbConfig = 'test';
 		public $useTable = 'cms_content';
@@ -14,10 +13,10 @@ class LockableTestCase extends CakeTestCase {
 
 		//need something to set with
 		var $fixtures = array(
-			'plugin.categories.global_category',
-			'plugin.cms.content',
+			'plugin.contents.global_category',
+			'plugin.cms.cms_content',
 			'plugin.management.ticket',
-			'plugin.management.group'
+			'plugin.users.group'
 		);
 
 		function startTest() {
@@ -42,7 +41,7 @@ function testLocking() {
 		}
 
 		function endTest() {
-			unset($this->Infinitas);
+			unset($this->LockableContent);
 			ClassRegistry::flush();
 		}
 	}
diff --git a/Core/Libs/Test/Case/Vendors/Shells/Tasks/ProgressBarTaskTest.php b/Core/Libs/Test/Case/Vendors/Shells/Tasks/ProgressBarTaskTest.php
@@ -1,4 +1,4 @@
-	<?php
+<?php
 	/**
 	 * ProgressBarTask Test Cases
 	 *
@@ -83,9 +83,9 @@ class ProgressBarTaskTest extends CakeTestCase {
 		 * @access public
 		 */
 		public function startTest() {
-			$this->Dispatcher = new TestProgressBarTaskMockShellDispatcher();
+			$this->Dispatcher = new ShellDispatcher();
 			$this->Dispatcher->shellPaths = App::path('shells');
-			$this->Task = new MockProgressBarTask($this->Dispatcher);
+			$this->Task = new TestProgressBarTask($this->Dispatcher);
 			$this->Task->Dispatch = $this->Dispatcher;
 			$this->Task->path = TMP . 'tests' . DS;
 		}