Keys shouldn't be mutually exclusive

Author: halivert

src/Console/CreateJSRoutesCommand.php

@@ -99,15 +99,15 @@ private function includeRoute($route, $routeName)
     {
         $include = $this->getOption('include');
 
-        if (!empty($include)) {
-            return Str::is($include, $routeName);
+        if (!empty($include) and Str::is($include, $routeName)) {
+            return true;
         }
 
         $exclude = $this->getOption('exclude');
 
-        if (!empty($exclude)) {
-            return !Str::is($exclude, $routeName);
-        };
+        if (!empty($exclude) and Str::is($exclude, $routeName)) {
+            return false;
+        }
 
         $methods = $this->getOption('methods');
 

tests/CreateOnlyGETMethodsTest.php

@@ -0,0 +1,86 @@
+<?php
+
+namespace Halivert\JSRoutes\Tests;
+
+use Halivert\JSRoutes\Console\CreateJSRoutesCommand;
+use Illuminate\Routing\Router;
+use Orchestra\Testbench\TestCase;
+
+class CreateOnlyGETMethodsTest extends TestCase
+{
+	protected function getPackageProviders($app)
+	{
+		return [
+			'Halivert\JSRoutes\Tests\Stubs\Providers\JSRoutesServiceProviderTest'
+		];
+	}
+
+	protected function getEnvironmentSetUp($app)
+	{
+		$app['router']->get('get', ['as' => 'get', 'uses' => function () {
+			return 'hello world';
+		}]);
+
+		$app['router']->get('get/{id}', ['as' => 'hi', 'uses' => function () {
+			return 'hello world';
+		}]);
+
+		$app['router']->post('post', function () {
+			return 'goodbye world';
+		})->name('bye');
+
+		$app['router']->group(['prefix' => 'boss'], function (Router $router) {
+			$router->put('put', ['as' => 'boss.hi', 'uses' => function () {
+				return 'hello boss';
+			}]);
+
+			$router->delete('delete', function () {
+				return 'goodbye boss';
+			})->name('boss.bye');
+		});
+
+
+		$app['router']->patch('patch', function () {
+			return 'goodbye world';
+		})->name('patch');
+
+		$app['router']->options('options', function () {
+			return 'goodbye world';
+		})->name('options');
+
+		$app['router']->get('bruh', function () {
+			return 'goodbye world';
+		})->name('telescope');
+
+		$app['router']->get('bruh/get', function () {
+			return 'Telescope get';
+		})->name('telescope.get');
+
+
+		$app['router']->get('multi/{id}/param/{id2}/url/{id}', function () {
+			return 'goodbye world';
+		})->name('multiparam');
+
+		$app['config']->set('app.jsroutes.path', './');
+		$app['config']->set('app.jsroutes.methods', ['GET']);
+		$app['config']->set('app.jsroutes.include', ['get']);
+		$app['config']->set('app.jsroutes.exclude', ['telescope*']);
+	}
+
+	/**
+	 * @test
+	 */
+	public function it_creates_file()
+	{
+		if (file_exists(realpath('./routes.js'))) {
+			$this->artisan('route:tojs')->expectsQuestion(
+				"The [routes.js] file already exists. Do you want to replace it?",
+				"yes"
+			)->expectsOutput('routes.js created')->assertExitCode(0);
+		} else {
+			$this->artisan('route:tojs')
+				->expectsOutput('routes.js created')
+				->assertExitCode(0);
+		}
+	}
+}