浏览代码

Merge remote-tracking branch 'origin/master'

shalvah 2 年之前
父节点
当前提交
bb2f6c5c51
共有 3 个文件被更改,包括 14 次插入3 次删除
  1. 5 0
      src/Commands/GenerateDocumentation.php
  2. 1 1
      src/Commands/Upgrade.php
  3. 8 2
      tests/GenerateDocumentation/BehavioursTest.php

+ 5 - 0
src/Commands/GenerateDocumentation.php

@@ -155,6 +155,11 @@ class GenerateDocumentation extends Command
 
 
         $this->info("Checking for any pending upgrades to your config file...");
         $this->info("Checking for any pending upgrades to your config file...");
         try {
         try {
+            if (! $this->laravel['files']->exists($this->laravel->configPath("{$this->configName}.php"))) {
+                $this->info("No config file to upgrade.");
+                return;
+            }
+
             $upgrader = Upgrader::ofConfigFile("config/{$this->configName}.php", __DIR__ . '/../../config/scribe.php')
             $upgrader = Upgrader::ofConfigFile("config/{$this->configName}.php", __DIR__ . '/../../config/scribe.php')
                 ->dontTouch(
                 ->dontTouch(
                     'routes', 'example_languages', 'database_connections_to_transact', 'strategies', 'laravel.middleware',
                     'routes', 'example_languages', 'database_connections_to_transact', 'strategies', 'laravel.middleware',

+ 1 - 1
src/Commands/Upgrade.php

@@ -42,7 +42,7 @@ class Upgrade extends Command
 
 
         $upgrader = Upgrader::ofConfigFile("config/$this->configName.php", __DIR__ . '/../../config/scribe.php')
         $upgrader = Upgrader::ofConfigFile("config/$this->configName.php", __DIR__ . '/../../config/scribe.php')
             ->dontTouch('routes', 'laravel.middleware', 'postman.overrides', 'openapi.overrides',
             ->dontTouch('routes', 'laravel.middleware', 'postman.overrides', 'openapi.overrides',
-                'example_languages', 'database_connections_to_transact', 'strategies')
+                'example_languages', 'database_connections_to_transact', 'strategies', 'examples.models_source')
             ->move('default_group', 'groups.default')
             ->move('default_group', 'groups.default')
             ->move('faker_seed', 'examples.faker_seed');
             ->move('faker_seed', 'examples.faker_seed');
 
 

+ 8 - 2
tests/GenerateDocumentation/BehavioursTest.php

@@ -2,6 +2,7 @@
 
 
 namespace Knuckles\Scribe\Tests\GenerateDocumentation;
 namespace Knuckles\Scribe\Tests\GenerateDocumentation;
 
 
+use Illuminate\Support\Facades\File as FileFacade;
 use Illuminate\Support\Facades\Route as RouteFacade;
 use Illuminate\Support\Facades\Route as RouteFacade;
 use Knuckles\Scribe\Commands\GenerateDocumentation;
 use Knuckles\Scribe\Commands\GenerateDocumentation;
 use Knuckles\Scribe\Scribe;
 use Knuckles\Scribe\Scribe;
@@ -213,8 +214,13 @@ class BehavioursTest extends BaseLaravelTest
         config(["scribe_test" => require "config/scribe_test.php"]);
         config(["scribe_test" => require "config/scribe_test.php"]);
 
 
         $output = $this->artisan('scribe:generate', ['--config' => 'scribe_test']);
         $output = $this->artisan('scribe:generate', ['--config' => 'scribe_test']);
-        $this->assertStringContainsString("Checking for any pending upgrades to your config file...", $output);
-        $this->assertStringContainsString("`logo` will be added", $output);
+
+        if (! FileFacade::exists(config_path("scribe.php"))) {
+            $this->assertStringContainsString("No config file to upgrade.", $output);
+        } else {
+            $this->assertStringContainsString("Checking for any pending upgrades to your config file...", $output);
+            $this->assertStringContainsString("`logo` will be added", $output);
+        }
 
 
         $output = $this->artisan('scribe:generate', ['--config' => 'scribe_test', '--no-upgrade-check' => true]);
         $output = $this->artisan('scribe:generate', ['--config' => 'scribe_test', '--no-upgrade-check' => true]);
         $this->assertStringNotContainsString("Checking for any pending upgrades to your config file...", $output);
         $this->assertStringNotContainsString("Checking for any pending upgrades to your config file...", $output);