On failed call to save(), missing return statement caused conflicting messages to be sent back

Closes #3

Author: adamlundrigan

src/LdcUserProfile/Controller/ProfileController.php

@@ -53,6 +53,8 @@ public function indexAction()
 
         if ( ! $this->getService()->save($form->getData()) ) {
             $fm->addErrorMessage('There was a problem saving your profile update.');
+
+            return $vm;
         }
 
         $fm->addSuccessMessage('Profile updated successfully!');

tests/LdcUserProfileTest/Controller/ProfileControllerTest.php

@@ -119,7 +119,7 @@ public function testControllerDispatchedWithValidFormDataWillCompleteAndRedirect
         $this->mockForm->shouldReceive('isValid')->andReturn(true);
         $this->mockForm->shouldReceive('getData')->andReturn($mockResult);
 
-        $this->mockProfileService->shouldReceive('save')->withArgs(array($mockResult));
+        $this->mockProfileService->shouldReceive('save')->withArgs(array($mockResult))->andReturn(true);
 
         $result = $this->controller->indexAction();
 
@@ -153,6 +153,35 @@ public function testControllerDispatchedWithInvalidFormDataWillRenderForm()
         $this->assertSame($this->mockModuleOptions, $result->getVariable('options'));
     }
 
+    public function testControllerWillRenderFormWhenSaveCallFails()
+    {
+        $this->event->setResponse($this->controller->getResponse());
+
+        $req = $this->controller->getRequest();
+        $req->setMethod(Request::METHOD_POST);
+        $req->getPost()->set('foo', 'bar');
+
+        $postData = $req->getPost()->toArray();
+        $mockResult = new \stdClass();
+
+        $mockPrg = \Mockery::mock('Zend\Mvc\Controller\Plugin\PostRedirectGet[__invoke]]');
+        $mockPrg->shouldReceive('__invoke')->andReturn($postData);
+        $pm = $this->controller->getPluginManager();
+        $pm->setService('prg', $mockPrg);
+
+        $this->mockForm->shouldReceive('setData')->withArgs(array($postData));
+        $this->mockForm->shouldReceive('isValid')->andReturn(true);
+        $this->mockForm->shouldReceive('getData')->andReturn($mockResult);
+
+        $this->mockProfileService->shouldReceive('save')->withArgs(array($mockResult))->andReturn(false);
+
+        $result = $this->controller->indexAction();
+
+        $this->assertInstanceOf('Zend\View\Model\ModelInterface', $result);
+        $this->assertSame($this->mockForm, $result->getVariable('profileForm'));
+        $this->assertSame($this->mockModuleOptions, $result->getVariable('options'));
+    }
+
     public function testGetSetService()
     {
         $this->mockService = \Mockery::mock('LdcUserProfile\Service\ProfileService');