From 10bf41a4df1cd16404d80e240a6af0ca910365a8 Mon Sep 17 00:00:00 2001
From: Jeremy Harris <jeremy@42pixels.com>
Date: Tue, 14 Dec 2010 19:00:26 -0800
Subject: [PATCH] Merge commit '42a5ebf47b73bbdf200f0238e30e6d4893695f80' into
 2.0

---
 .../cases/libs/controller/components/paginator.test.php     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/cake/tests/cases/libs/controller/components/paginator.test.php b/cake/tests/cases/libs/controller/components/paginator.test.php
index eebdd3304cb..93ee5b6b5b9 100644
--- a/cake/tests/cases/libs/controller/components/paginator.test.php
+++ b/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');		
 	}
 }
\ No newline at end of file