Merge commit '42a5ebf47b73bbdf200f0238e30e6d4893695f80' into 2.0

cake/tests/cases/libs/controller/components/paginator.test.php

@@ -473,13 +473,17 @@ function testPaginateOrderVirtualField() {
 		$this->assertEqual(Set::extract($result, '{n}.ControllerPost.offset_test'), array(2, 3, 4));
 	}
 
+/**
+ * Tests for missing models
+ *
+ * @expectedException MissingModelException
+ */
 	function testPaginateMissingModel() {
 		$request = new CakeRequest('controller_posts/index');
 		$request->params['pass'] = $request->params['named'] = array();
 
 		$Controller = new PaginatorTestController($request);
 		$Controller->constructClasses();
-		$this->expectException('MissingModelException');
 		$Controller->Paginator->paginate('MissingModel');		
 	}
 }