Merge pull request #51 from davidyell/plugin-tables

Resolves #50
loadsys · Aug 2, 2017 · ff00f3f · ff00f3f
2 parents b636da4 + f9b6d9c
commit ff00f3f
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 3 deletions.
diff --git a/src/Controller/SitemapsController.php b/src/Controller/SitemapsController.php
@@ -25,8 +25,8 @@ public function index() {
 		}
 
 		foreach ($tablesToList as $table) {
-			$this->loadModel($table);
-			$data[$table] = $this->{$table}->find('forSitemap');
+			$tableInstance = $this->loadModel($table);
+			$data[$table] = $tableInstance->find('forSitemap');
 		}
 
 		$this->set('data', $data);

diff --git a/tests/TestCase/Controller/SitemapsControllerTest.php b/tests/TestCase/Controller/SitemapsControllerTest.php
@@ -5,6 +5,8 @@
 namespace Sitemap\Test\TestCase\Controller;
 
 use Cake\Core\Configure;
+use Cake\Database\Schema\TableSchema;
+use Cake\ORM\Table;
 use Cake\ORM\TableRegistry;
 use Cake\TestSuite\IntegrationTestCase;
 use Sitemap\Controller\SitemapsController;
@@ -44,6 +46,8 @@ public function setUp() {
 	public function tearDown() {
 		unset($this->Pages);
 
+		Configure::clear();
+
 		parent::tearDown();
 	}
 
@@ -109,7 +113,7 @@ public function testIndexWithModels() {
 		$Controller->expects($this->once())
 			->method('loadModel')
 			->with('Pages')
-			->will($this->returnValue(true));
+			->willReturn($this->Pages);
 
 		$Controller->Pages = $this->Pages;
 
@@ -127,4 +131,36 @@ public function testIndexAccess() {
 
 		$this->assertResponseOk();
 	}
+
+	/**
+	 * Test that the index method can execute finds on namespaced plugin tables
+	 *
+	 * @return void
+	 */
+	public function testLoadingPluginTables() {
+		$exampleTableName = 'Example/Plugin.Posts';
+		Configure::write('Sitemap.tables', [$exampleTableName]);
+
+		$tableInstance = new Table([
+			'registryAlias' => 'Example/Plugin.Posts',
+			'alias' => 'Posts',
+			'table' => 'posts',
+			'schema' => new TableSchema('posts', [
+				'id' => ['type' => 'integer'],
+				'title' => ['type' => 'string'],
+			]),
+		]);
+		$tableInstance->addBehavior('Sitemap.Sitemap');
+
+		$Controller = $this->getMockBuilder(SitemapsController::class)
+			->setMethods(['loadModel'])
+			->getMock();
+
+		$Controller->expects($this->once())
+			->method('loadModel')
+			->with($exampleTableName)
+			->willReturn($tableInstance);
+
+		$Controller->index();
+	}
 }