Still trying to get the tests working

Author: jim-parry

system/RESTful/ResourceController.php

@@ -75,11 +75,11 @@ public function initController(\CodeIgniter\HTTP\RequestInterface $request, \Cod
 		parent::initController($request, $response, $logger);
 
 		// instantiate our model, if needed
-		if (! empty($this->modelName))
+		if (empty($this->model) && ! empty($this->modelName))
 		{
 			try
 			{
-				$this->model = $this->modelName();
+				$this->model = new $this->modelName;
 			}
 			catch (\Exception $e)
 			{
@@ -97,7 +97,7 @@ public function initController(\CodeIgniter\HTTP\RequestInterface $request, \Cod
 	 */
 	public function index()
 	{
-		return $this->fail('index: Action not implemented', 501);
+		return $this->fail('Action not implemented', 501);
 	}
 
 	/**
@@ -107,7 +107,7 @@ public function index()
 	 */
 	public function show($id = null)
 	{
-		$this->fail('Action not implemented', 501);
+		return $this->fail('Action not implemented', 501);
 	}
 
 	/**
@@ -117,7 +117,7 @@ public function show($id = null)
 	 */
 	public function new()
 	{
-		$this->fail('Action not implemented', 501);
+		return $this->fail('Action not implemented', 501);
 	}
 
 	/**
@@ -127,7 +127,7 @@ public function new()
 	 */
 	public function create()
 	{
-		$this->fail('Action not implemented', 501);
+		return $this->fail('Action not implemented', 501);
 	}
 
 	/**
@@ -137,7 +137,7 @@ public function create()
 	 */
 	public function edit($id = null)
 	{
-		$this->fail('Action not implemented', 501);
+		return $this->fail('Action not implemented', 501);
 	}
 
 	/**
@@ -147,7 +147,7 @@ public function edit($id = null)
 	 */
 	public function update($id = null)
 	{
-		$this->fail('Action not implemented', 501);
+		return $this->fail('Action not implemented', 501);
 	}
 
 	/**
@@ -157,7 +157,7 @@ public function update($id = null)
 	 */
 	public function delete($id = null)
 	{
-		$this->fail('Action not implemented', 501);
+		return $this->fail('Action not implemented', 501);
 	}
 
 	//--------------------------------------------------------------------
@@ -169,7 +169,17 @@ public function delete($id = null)
 	 */
 	public function setModel($which = null)
 	{
-		$this->model = $model;
+		if (! empty($which))
+		{
+			if ($which instanceof \CodeIgniter\Model)
+			{
+				$this->model = $which;
+			}
+			else
+			{
+				$this->modelName = $which;
+			}
+		}
 	}
 
 	/**

tests/_support/RESTful/Worker.php

@@ -8,5 +8,4 @@
  */
 class Worker extends ResourceController
 {
-
 }