Merge pull request #2676 from gmhenderson/2.1

Allow Laravel5 application URL to be set through config
Codeception · Jan 3, 2016 · cf809a2 · cf809a2
2 parents 84e1846 + d840645
commit cf809a2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/Codeception/Lib/Connector/Laravel5.php b/src/Codeception/Lib/Connector/Laravel5.php
@@ -54,7 +54,7 @@ public function __construct($module)
         $this->module = $module;
         $this->initialize();
 
-        $components = parse_url($this->app['config']->get('app.url', 'http://localhost'));
+        $components = array_key_exists('url', $this->module->config) ? parse_url($this->module->config['url']) : parse_url($this->app['config']->get('app.url', 'http://localhost'));
         $host = isset($components['host']) ? $components['host'] : 'localhost';
 
         parent::__construct($this->app, ['HTTP_HOST' => $host]);

diff --git a/src/Codeception/Module/Laravel5.php b/src/Codeception/Module/Laravel5.php
@@ -43,6 +43,7 @@
  * * packages: `string`, default `workbench` - Root path of application packages (if any).
  * * disable_middleware: `boolean`, default `false` - disable all middleware.
  * * disable_events: `boolean`, default `false` - disable all events.
+ * * url: `string`, default `` - The application URL.
  *
  * ## API
  *