Merge fcc966c into dca4c37

loadsys · Nov 10, 2016 · 3c1b37f · 3c1b37f
2 parents dca4c37 + fcc966c
commit 3c1b37f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/Controller/SitemapsController.php b/src/Controller/SitemapsController.php
@@ -30,5 +30,6 @@ public function index() {
 		}
 
 		$this->set('data', $data);
+		$this->set('_serialize', false);
 	}
 }
diff --git a/tests/TestCase/Controller/SitemapsControllerTest.php b/tests/TestCase/Controller/SitemapsControllerTest.php
@@ -67,11 +67,17 @@ public function testIndexNoModels() {
 			'\Sitemap\Controller\SitemapsController',
 			['set']
 		);
-		$Controller->expects($this->once())
+
+		$Controller->expects($this->at(0))
 			->method('set')
 			->with('data', [])
 			->will($this->returnValue(true));
 
+		$Controller->expects($this->at(1))
+			->method('set')
+			->with('_serialize', false)
+			->will($this->returnValue(true));
+
 		$Controller->index();
 	}
 
@@ -89,11 +95,17 @@ public function testIndexWithModels() {
 			'\Sitemap\Controller\SitemapsController',
 			['set', 'loadModel']
 		);
-		$Controller->expects($this->once())
+
+		$Controller->expects($this->at(1))
 			->method('set')
 			->with('data', ['Pages' => $pagesFindQuery])
 			->will($this->returnValue(true));
 
+		$Controller->expects($this->at(2))
+			->method('set')
+			->with('_serialize', false)
+			->will($this->returnValue(true));
+
 		$Controller->expects($this->once())
 			->method('loadModel')
 			->with('Pages')