Merge pull request #46 from scrnhq/hotfix/45-config-reference

Use correct reference to Bakery models, fixes #45
scrnhq · Jul 11, 2018 · eafa412 · eafa412
2 parents fad5ec9 + d314d46
commit eafa412
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 5 deletions.
diff --git a/src/Support/DefaultSchema.php b/src/Support/DefaultSchema.php
@@ -2,10 +2,16 @@
 
 namespace Bakery\Support;
 
+use Bakery\Utils\Utils;
+
 class DefaultSchema extends Schema
 {
     public function models()
     {
-        return config('bakery.types', []);
+        $models = config('bakery.models');
+
+        Utils::invariant(count($models) > 0, 'There must be models defined in the Bakery config.');
+
+        return $models;
     }
 }
diff --git a/src/Support/Schema.php b/src/Support/Schema.php
@@ -185,6 +185,8 @@ public function toGraphQLSchema(): GraphQLSchema
             ['name' => 'Query']
         );
 
+        Utils::invariant(count($query->getFields()) > 0, 'There must be query fields defined in the schema.');
+
         if (count($query->getFields()) > 0) {
             $config->setQuery($query);
         }

diff --git a/tests/FeatureTestCase.php b/tests/FeatureTestCase.php
@@ -42,7 +42,7 @@ protected function setUp()
         $this->withFactories(__DIR__.'/factories');
 
         // Set up default schema.
-        app()['config']->set('bakery.types', [
+        app()['config']->set('bakery.models', [
             Stubs\BakeryModels\UserBakery::class,
             Stubs\BakeryModels\ArticleBakery::class,
             Stubs\BakeryModels\PhoneBakery::class,

diff --git a/tests/SchemaTest.php b/tests/SchemaTest.php
@@ -3,6 +3,7 @@
 namespace Bakery\Tests;
 
 use Bakery\Support\Schema;
+use Bakery\Support\DefaultSchema;
 use Bakery\Tests\Stubs\DummyType;
 use Bakery\Tests\Stubs\DummyClass;
 use Bakery\Tests\Stubs\DummyModel;
@@ -54,11 +55,24 @@ class TestSchema extends Schema
 
 class SchemaTest extends FeatureTestCase
 {
-    protected function setUp()
+    /** @test */
+    public function it_throws_exception_when_there_are_no_models_defined_with_default_schema()
     {
-        parent::setUp();
+        app()['config']->set('bakery.models', []);
+
+        $this->expectException(InvariantViolation::class);
+
+        $schema = new DefaultSchema();
+        $schema->toGraphQLSchema();
+    }
 
-        app()['config']->set('bakery.types', []);
+    /** @test */
+    public function it_throws_exception_when_there_are_no_query_fields_defined_in_a_schema()
+    {
+        $this->expectException(InvariantViolation::class);
+
+        $schema = new Schema();
+        $schema->toGraphQLSchema();
     }
 
     /** @test */