Merge branch 'develop' into feature/upgrade-laravel-to-5.6

This commit is contained in:
Dane Everitt 2018-05-20 16:30:42 -07:00 committed by GitHub
commit 7e2e5fd7c1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
129 changed files with 234 additions and 202 deletions

View file

@ -36,7 +36,7 @@ class EnvironmentServiceTest extends TestCase
}
/**
* Test that set environment key stores the key into a retreviable array.
* Test that set environment key stores the key into a retrievable array.
*/
public function testSettingEnvironmentKeyPersistsItInArray()
{
@ -92,7 +92,7 @@ class EnvironmentServiceTest extends TestCase
/**
* Test that duplicate variables provided in config override the defaults.
*/
public function testProcessShouldAllowOverwritingVaraiblesWithConfigurationFile()
public function testProcessShouldAllowOverwritingVariablesWithConfigurationFile()
{
$model = $this->getServerModel();
$this->repository->shouldReceive('getVariablesWithValues')->with($model->id)->once()->andReturn([]);