Browse Source

Update tests for new controller stubs update

tags/1.2.9
Nafies Luthfi 7 years ago
parent
commit
064b97ef66
  1. 9
      tests/CommandOptions/FullCrudFormRequestOptionsTest.php
  2. 9
      tests/Generators/Api/ApiControllerGeneratorTest.php
  3. 27
      tests/Generators/FullControllerGeneratorTest.php
  4. 27
      tests/Generators/Simple/SimpleControllerGeneratorTest.php

9
tests/CommandOptions/FullCrudFormRequestOptionsTest.php

@ -134,18 +134,17 @@ class {$this->model_name}Controller extends Controller
/** /**
* Remove the specified {$this->single_model_var_name} from storage. * Remove the specified {$this->single_model_var_name} from storage.
* *
* @param \Illuminate\Http\Request \$request
* @param \\{$this->full_model_name} \${$this->single_model_var_name} * @param \\{$this->full_model_name} \${$this->single_model_var_name}
* @return \Illuminate\Routing\Redirector * @return \Illuminate\Routing\Redirector
*/ */
public function destroy({$this->model_name} \${$this->single_model_var_name})
public function destroy(Request \$request, {$this->model_name} \${$this->single_model_var_name})
{ {
\$this->authorize('delete', \${$this->single_model_var_name}); \$this->authorize('delete', \${$this->single_model_var_name});
request()->validate([
'{$this->lang_name}_id' => 'required',
]);
\$request->validate(['{$this->lang_name}_id' => 'required']);
if (request('{$this->lang_name}_id') == \${$this->single_model_var_name}->id && \${$this->single_model_var_name}->delete()) {
if (\$request->get('{$this->lang_name}_id') == \${$this->single_model_var_name}->id && \${$this->single_model_var_name}->delete()) {
return redirect()->route('{$this->table_name}.index'); return redirect()->route('{$this->table_name}.index');
} }

9
tests/Generators/Api/ApiControllerGeneratorTest.php

@ -97,18 +97,17 @@ class {$this->model_name}Controller extends Controller
/** /**
* Remove the specified {$this->single_model_var_name} from storage. * Remove the specified {$this->single_model_var_name} from storage.
* *
* @param \Illuminate\Http\Request \$request
* @param \\{$this->full_model_name} \${$this->single_model_var_name} * @param \\{$this->full_model_name} \${$this->single_model_var_name}
* @return \Illuminate\Http\JsonResponse * @return \Illuminate\Http\JsonResponse
*/ */
public function destroy({$this->model_name} \${$this->single_model_var_name})
public function destroy(Request \$request, {$this->model_name} \${$this->single_model_var_name})
{ {
\$this->authorize('delete', \${$this->single_model_var_name}); \$this->authorize('delete', \${$this->single_model_var_name});
request()->validate([
'{$this->lang_name}_id' => 'required',
]);
\$request->validate(['{$this->lang_name}_id' => 'required']);
if (request('{$this->lang_name}_id') == \${$this->single_model_var_name}->id && \${$this->single_model_var_name}->delete()) {
if (\$request->get('{$this->lang_name}_id') == \${$this->single_model_var_name}->id && \${$this->single_model_var_name}->delete()) {
return response()->json(['message' => __('{$this->lang_name}.deleted')]); return response()->json(['message' => __('{$this->lang_name}.deleted')]);
} }

27
tests/Generators/FullControllerGeneratorTest.php

@ -115,18 +115,17 @@ class {$this->model_name}Controller extends Controller
/** /**
* Remove the specified {$this->single_model_var_name} from storage. * Remove the specified {$this->single_model_var_name} from storage.
* *
* @param \Illuminate\Http\Request \$request
* @param \\{$this->full_model_name} \${$this->single_model_var_name} * @param \\{$this->full_model_name} \${$this->single_model_var_name}
* @return \Illuminate\Routing\Redirector * @return \Illuminate\Routing\Redirector
*/ */
public function destroy({$this->model_name} \${$this->single_model_var_name})
public function destroy(Request \$request, {$this->model_name} \${$this->single_model_var_name})
{ {
\$this->authorize('delete', \${$this->single_model_var_name}); \$this->authorize('delete', \${$this->single_model_var_name});
request()->validate([
'{$this->lang_name}_id' => 'required',
]);
\$request->validate(['{$this->lang_name}_id' => 'required']);
if (request('{$this->lang_name}_id') == \${$this->single_model_var_name}->id && \${$this->single_model_var_name}->delete()) {
if (\$request->get('{$this->lang_name}_id') == \${$this->single_model_var_name}->id && \${$this->single_model_var_name}->delete()) {
return redirect()->route('{$this->table_name}.index'); return redirect()->route('{$this->table_name}.index');
} }
@ -246,18 +245,17 @@ class CategoryController extends Controller
/** /**
* Remove the specified category from storage. * Remove the specified category from storage.
* *
* @param \Illuminate\Http\Request \$request
* @param \App\Entities\References\Category \$category * @param \App\Entities\References\Category \$category
* @return \Illuminate\Routing\Redirector * @return \Illuminate\Routing\Redirector
*/ */
public function destroy(Category \$category)
public function destroy(Request \$request, Category \$category)
{ {
\$this->authorize('delete', \$category); \$this->authorize('delete', \$category);
request()->validate([
'category_id' => 'required',
]);
\$request->validate(['category_id' => 'required']);
if (request('category_id') == \$category->id && \$category->delete()) {
if (\$request->get('category_id') == \$category->id && \$category->delete()) {
return redirect()->route('categories.index'); return redirect()->route('categories.index');
} }
@ -378,18 +376,17 @@ class CategoryController extends Controller
/** /**
* Remove the specified category from storage. * Remove the specified category from storage.
* *
* @param \Illuminate\Http\Request \$request
* @param \App\Entities\References\Category \$category * @param \App\Entities\References\Category \$category
* @return \Illuminate\Routing\Redirector * @return \Illuminate\Routing\Redirector
*/ */
public function destroy(Category \$category)
public function destroy(Request \$request, Category \$category)
{ {
\$this->authorize('delete', \$category); \$this->authorize('delete', \$category);
request()->validate([
'category_id' => 'required',
]);
\$request->validate(['category_id' => 'required']);
if (request('category_id') == \$category->id && \$category->delete()) {
if (\$request->get('category_id') == \$category->id && \$category->delete()) {
return redirect()->route('categories.index'); return redirect()->route('categories.index');
} }

27
tests/Generators/Simple/SimpleControllerGeneratorTest.php

@ -86,18 +86,17 @@ class {$this->model_name}Controller extends Controller
/** /**
* Remove the specified {$this->single_model_var_name} from storage. * Remove the specified {$this->single_model_var_name} from storage.
* *
* @param \Illuminate\Http\Request \$request
* @param \\{$this->full_model_name} \${$this->single_model_var_name} * @param \\{$this->full_model_name} \${$this->single_model_var_name}
* @return \Illuminate\Routing\Redirector * @return \Illuminate\Routing\Redirector
*/ */
public function destroy({$this->model_name} \${$this->single_model_var_name})
public function destroy(Request \$request, {$this->model_name} \${$this->single_model_var_name})
{ {
\$this->authorize('delete', \${$this->single_model_var_name}); \$this->authorize('delete', \${$this->single_model_var_name});
request()->validate([
'{$this->lang_name}_id' => 'required',
]);
\$request->validate(['{$this->lang_name}_id' => 'required']);
if (request('{$this->lang_name}_id') == \${$this->single_model_var_name}->id && \${$this->single_model_var_name}->delete()) {
if (\$request->get('{$this->lang_name}_id') == \${$this->single_model_var_name}->id && \${$this->single_model_var_name}->delete()) {
\$routeParam = request()->only('page', 'q'); \$routeParam = request()->only('page', 'q');
return redirect()->route('{$this->table_name}.index', \$routeParam); return redirect()->route('{$this->table_name}.index', \$routeParam);
@ -190,18 +189,17 @@ class CategoryController extends Controller
/** /**
* Remove the specified category from storage. * Remove the specified category from storage.
* *
* @param \Illuminate\Http\Request \$request
* @param \App\Entities\References\Category \$category * @param \App\Entities\References\Category \$category
* @return \Illuminate\Routing\Redirector * @return \Illuminate\Routing\Redirector
*/ */
public function destroy(Category \$category)
public function destroy(Request \$request, Category \$category)
{ {
\$this->authorize('delete', \$category); \$this->authorize('delete', \$category);
request()->validate([
'category_id' => 'required',
]);
\$request->validate(['category_id' => 'required']);
if (request('category_id') == \$category->id && \$category->delete()) {
if (\$request->get('category_id') == \$category->id && \$category->delete()) {
\$routeParam = request()->only('page', 'q'); \$routeParam = request()->only('page', 'q');
return redirect()->route('categories.index', \$routeParam); return redirect()->route('categories.index', \$routeParam);
@ -295,18 +293,17 @@ class CategoryController extends Controller
/** /**
* Remove the specified category from storage. * Remove the specified category from storage.
* *
* @param \Illuminate\Http\Request \$request
* @param \App\Entities\References\Category \$category * @param \App\Entities\References\Category \$category
* @return \Illuminate\Routing\Redirector * @return \Illuminate\Routing\Redirector
*/ */
public function destroy(Category \$category)
public function destroy(Request \$request, Category \$category)
{ {
\$this->authorize('delete', \$category); \$this->authorize('delete', \$category);
request()->validate([
'category_id' => 'required',
]);
\$request->validate(['category_id' => 'required']);
if (request('category_id') == \$category->id && \$category->delete()) {
if (\$request->get('category_id') == \$category->id && \$category->delete()) {
\$routeParam = request()->only('page', 'q'); \$routeParam = request()->only('page', 'q');
return redirect()->route('categories.index', \$routeParam); return redirect()->route('categories.index', \$routeParam);

Loading…
Cancel
Save