Avoid wrapping Artisan command --url option with url() helper when po…

…ssible (#361)

* Add sometimes-failing test for edge cases

* Only wrap URL passed to artisan command if it is present and not valid

* Remove edge case test and rename pathname one

* Simplify URL wrapping

src/CommandRouteGenerator.php

@@ -8,7 +8,7 @@
 
 class CommandRouteGenerator extends Command
 {
-    protected $signature = 'ziggy:generate {path=./resources/js/ziggy.js} {--url=/} {--group=}';
+    protected $signature = 'ziggy:generate {path=./resources/js/ziggy.js} {--url=} {--group=}';
 
     protected $description = 'Generate js file for including in build process';
 
@@ -24,20 +24,17 @@ public function __construct(Filesystem $files)
     public function handle()
     {
         $path = $this->argument('path');
-        $group = $this->option('group');
-
-        $generatedRoutes = $this->generate($group);
+        $generatedRoutes = $this->generate($this->option('group'));
 
         $this->makeDirectory($path);
-
         $this->files->put(base_path($path), $generatedRoutes);
 
         $this->info('File generated!');
     }
 
     private function generate($group = false)
     {
-        $payload = (new Ziggy($group, url($this->option('url'))))->toJson();
+        $payload = (new Ziggy($group, $this->option('url') ? url($this->option('url')) : null))->toJson();
 
         return <<<JAVASCRIPT
 const Ziggy = {$payload};

tests/Unit/CommandRouteGeneratorTest.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\URL;
+use Illuminate\Support\Str;
 use Tests\TestCase;
 
 class CommandRouteGeneratorTest extends TestCase
@@ -63,6 +64,19 @@ public function can_generate_file_with_custom_url()
         $this->assertFileEquals('./tests/fixtures/custom-url.js', base_path('resources/js/ziggy.js'));
     }
 
+    /** @test */
+    public function can_generate_file_with_custom_pathname()
+    {
+        $router = app('router');
+        $router->get('posts/{post}/comments', $this->noop())->name('postComments.index');
+        $router->getRoutes()->refreshNameLookups();
+        URL::defaults(['locale' => 'en']);
+
+        Artisan::call('ziggy:generate', ['--url' => '/foo/bar']);
+
+        $this->assertFileEquals('./tests/fixtures/custom-pathname.js', base_path('resources/js/ziggy.js'));
+    }
+
     /** @test */
     public function can_generate_file_with_config_applied()
     {

tests/fixtures/custom-pathname.js

@@ -0,0 +1,9 @@
+const Ziggy = {"url":"http:\/\/ziggy.dev\/foo\/bar","port":null,"defaults":{"locale":"en"},"routes":{"postComments.index":{"uri":"posts\/{post}\/comments","methods":["GET","HEAD"]}}};
+
+if (typeof window !== 'undefined' && typeof window.Ziggy !== 'undefined') {
+    for (let name in window.Ziggy.routes) {
+        Ziggy.routes[name] = window.Ziggy.routes[name];
+    }
+}
+
+export { Ziggy };