Merge branch 'develop' into feature/exception-tests

This commit is contained in:
Dane Everitt
2018-05-20 16:26:18 -07:00
committed by GitHub
135 changed files with 241 additions and 209 deletions

View File

@@ -79,7 +79,7 @@ class RemoteRequestControllerTest extends ControllerTestCase
}
/**
* Test that the controller properly handles an exception thrown by the daemon conneciton.
* Test that the controller properly handles an exception thrown by the daemon connection.
*/
public function testExceptionThrownByDaemonConnectionIsHandledByDisplayController()
{
@@ -125,7 +125,7 @@ class RemoteRequestControllerTest extends ControllerTestCase
}
/**
* Test that the controller properly handles an exception thrown by the daemon conneciton.
* Test that the controller properly handles an exception thrown by the daemon connection.
*/
public function testExceptionThrownByDaemonConnectionIsHandledByStoreController()
{