From 92c74eddcdf235c2bc4490dae88d04e984584759 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Thu, 29 Mar 2018 09:02:51 +0800
Subject: [PATCH] Update api route, controller and feature test class

---
 src/Generators/ControllerGenerator.php               | 8 ++++----
 src/stubs/controller.api.stub                        | 1 +
 src/stubs/route-api.stub                             | 2 +-
 src/stubs/test-feature-api.stub                      | 2 +-
 tests/Generators/Api/ApiControllerGeneratorTest.php  | 1 +
 tests/Generators/Api/ApiFeatureTestGeneratorTest.php | 4 ++--
 tests/Generators/Api/RouteApiGeneratorTest.php       | 4 ++--
 7 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/Generators/ControllerGenerator.php b/src/Generators/ControllerGenerator.php
index 450c313..16486a3 100644
--- a/src/Generators/ControllerGenerator.php
+++ b/src/Generators/ControllerGenerator.php
@@ -46,19 +46,19 @@ class ControllerGenerator extends BaseGenerator
         $appNamespace = $this->getAppNamespace();
 
         $controllerFileContent = str_replace(
-            "App\Http\Controllers;",
-            "{$appNamespace}Http\Controllers;",
+            "App\Http\Controllers",
+            "{$appNamespace}Http\Controllers",
             $controllerFileContent
         );
 
         if (!is_null($parentName = $this->command->option('parent'))) {
             $searches = [
-                "{$appNamespace}Http\Controllers;",
+                "{$appNamespace}Http\Controllers",
                 "use {$this->modelNames['full_model_name']};\n",
             ];
 
             $replacements = [
-                "{$appNamespace}Http\Controllers\\{$parentName};",
+                "{$appNamespace}Http\Controllers\\{$parentName}",
                 "use {$this->modelNames['full_model_name']};\nuse {$appNamespace}Http\Controllers\Controller;\n",
             ];
 
diff --git a/src/stubs/controller.api.stub b/src/stubs/controller.api.stub
index 1e5d1fe..621ace2 100644
--- a/src/stubs/controller.api.stub
+++ b/src/stubs/controller.api.stub
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Api;
 
 use fullMstr;
+use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 
 class MastersController extends Controller
diff --git a/src/stubs/route-api.stub b/src/stubs/route-api.stub
index a14f14b..9ac0c14 100644
--- a/src/stubs/route-api.stub
+++ b/src/stubs/route-api.stub
@@ -1,2 +1,2 @@
 
-Route::resource('masters', 'MastersController');
+Route::middleware('auth:api')->resource('masters', 'Api\MastersController')->names('api.masters');
diff --git a/src/stubs/test-feature-api.stub b/src/stubs/test-feature-api.stub
index bce7c6a..fe45749 100644
--- a/src/stubs/test-feature-api.stub
+++ b/src/stubs/test-feature-api.stub
@@ -83,7 +83,7 @@ class ManageMastersTest extends TestCase
         $user = $this->createUser();
         $singleMstr = factory(Master::class)->create();
 
-        $this->deleteJson(route('api.masters.delete', $singleMstr), [
+        $this->deleteJson(route('api.masters.destroy', $singleMstr), [
             'master_id' => $singleMstr->id,
         ], [
             'Authorization' => 'Bearer '.$user->api_token
diff --git a/tests/Generators/Api/ApiControllerGeneratorTest.php b/tests/Generators/Api/ApiControllerGeneratorTest.php
index 94e7ec7..0075ea3 100644
--- a/tests/Generators/Api/ApiControllerGeneratorTest.php
+++ b/tests/Generators/Api/ApiControllerGeneratorTest.php
@@ -17,6 +17,7 @@ class ApiControllerGeneratorTest extends TestCase
 namespace App\Http\Controllers\Api;
 
 use {$this->full_model_name};
+use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 
 class {$this->plural_model_name}Controller extends Controller
diff --git a/tests/Generators/Api/ApiFeatureTestGeneratorTest.php b/tests/Generators/Api/ApiFeatureTestGeneratorTest.php
index 659b25e..6167412 100644
--- a/tests/Generators/Api/ApiFeatureTestGeneratorTest.php
+++ b/tests/Generators/Api/ApiFeatureTestGeneratorTest.php
@@ -97,7 +97,7 @@ class Manage{$this->plural_model_name}Test extends TestCase
         \$user = \$this->createUser();
         \${$this->single_model_var_name} = factory({$this->model_name}::class)->create();
 
-        \$this->deleteJson(route('api.{$this->table_name}.delete', \${$this->single_model_var_name}), [
+        \$this->deleteJson(route('api.{$this->table_name}.destroy', \${$this->single_model_var_name}), [
             '{$this->lang_name}_id' => \${$this->single_model_var_name}->id,
         ], [
             'Authorization' => 'Bearer '.\$user->api_token
@@ -206,7 +206,7 @@ class Manage{$this->plural_model_name}Test extends TestCase
         \$user = \$this->createUser();
         \${$this->single_model_var_name} = factory({$this->model_name}::class)->create();
 
-        \$this->deleteJson(route('api.{$this->table_name}.delete', \${$this->single_model_var_name}), [
+        \$this->deleteJson(route('api.{$this->table_name}.destroy', \${$this->single_model_var_name}), [
             '{$this->lang_name}_id' => \${$this->single_model_var_name}->id,
         ], [
             'Authorization' => 'Bearer '.\$user->api_token
diff --git a/tests/Generators/Api/RouteApiGeneratorTest.php b/tests/Generators/Api/RouteApiGeneratorTest.php
index 1a164e1..61ad9f1 100644
--- a/tests/Generators/Api/RouteApiGeneratorTest.php
+++ b/tests/Generators/Api/RouteApiGeneratorTest.php
@@ -15,7 +15,7 @@ class RouteApiGeneratorTest extends TestCase
         $this->assertFileExists($routeApiPath);
         $routeApiFileContent = "<?php
 
-Route::resource('{$this->table_name}', '{$this->plural_model_name}Controller');
+Route::middleware('auth:api')->resource('{$this->table_name}', 'Api\\{$this->plural_model_name}Controller')->names('api.{$this->table_name}');
 ";
         $this->assertEquals($routeApiFileContent, file_get_contents($routeApiPath));
     }
@@ -29,7 +29,7 @@ Route::resource('{$this->table_name}', '{$this->plural_model_name}Controller');
         $this->assertFileExists($routeApiPath);
         $routeApiFileContent = "<?php
 
-Route::resource('{$this->table_name}', 'Projects\\{$this->plural_model_name}Controller');
+Route::middleware('auth:api')->resource('{$this->table_name}', 'Api\\Projects\\{$this->plural_model_name}Controller')->names('api.{$this->table_name}');
 ";
         $this->assertEquals($routeApiFileContent, file_get_contents($routeApiPath));
     }