Merge branch 'master' of https://github.com/ichtrojan/laravel-location

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+custom: ["https://rave.flutterwave.com/pay/trojantjkf"]

_config.yml

@@ -0,0 +1 @@
+theme: jekyll-theme-cayman

phpunit.xml.dist

@@ -8,7 +8,7 @@
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          processIsolation="false"
-         stopOnFailure="false">
+         stopOnFailure="true">
     <testsuites>
         <testsuite name="Laravel Location Test Suite">
             <directory>tests</directory>

src/database/seeds/CitiesTableSeeder.php

@@ -1,9 +1,9 @@
 <?php
-
 namespace Ichtrojan\Location\Seeds;
 
 use Illuminate\Database\Seeder;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
 
 class CitiesTableSeeder extends Seeder
 {
@@ -15,6 +15,10 @@ class CitiesTableSeeder extends Seeder
     public function run()
     {
         $citiesTable = config('location.cities_table', 'cities');
+
+         Schema::disableForeignKeyConstraints();
+        DB::table($citiesTable)->truncate();
+         Schema::enableForeignKeyConstraints();
 
         $cities = array(
             array('name' => "Bombuflat",'state_id' => 1),

src/database/seeds/CountriesTableSeeder.php

@@ -1,9 +1,9 @@
 <?php
-
 namespace Ichtrojan\Location\Seeds;
 
 use Illuminate\Database\Seeder;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
 
 class CountriesTableSeeder extends Seeder
 {
@@ -264,6 +264,10 @@ public function run()
             array('id' => 246,'code' => 'ZW','name' => "Zimbabwe",'phonecode' => 263),
         );
 
+        // Fix for issue #29 https://github.com/ichtrojan/laravel-location/issues/29
+        Schema::disableForeignKeyConstraints();
+        DB::table($countriesTable)->truncate();
+        Schema::enableForeignKeyConstraints();
         DB::table($countriesTable)->insert($countries);
     }
 }

src/database/seeds/StateCityCountrySeeder.php

@@ -1,5 +1,4 @@
 <?php
-
 namespace Ichtrojan\Location\Seeds;
 
 use Illuminate\Database\Seeder;

src/database/seeds/StatesTableSeeder.php

@@ -1,9 +1,9 @@
 <?php
-
 namespace Ichtrojan\Location\Seeds;
 
 use Illuminate\Database\Seeder;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
 
 class StatesTableSeeder extends Seeder
 {
@@ -4139,7 +4139,9 @@ public function run()
             array('name' => "Matabeleland South",'country_id' => 246),
             array('name' => "Midlands",'country_id' => 246)
         );
-
+        Schema::disableForeignKeyConstraints();
+        DB::table($statesTable)->truncate();
+        Schema::enableForeignKeyConstraints();
         DB::table($statesTable)->insert($states);
     }
 }

tests/LocationRouteTest.php

@@ -2,6 +2,9 @@
 
 namespace Ichtrojan\Location\Test;
 
+use Ichtrojan\Location\Models\City;
+use Ichtrojan\Location\Models\State;
+
 class LocationRouteTest extends TestCase
 {
 
@@ -123,5 +126,35 @@ public function it_can_access_cities_by_country()
         $this->assertEquals($firstCity, $responseData[0]);
     }
 
+    /** @test */
+    public function test_all_states_have_country_id()
+    {
+        $count = State::query()
+            ->whereNull('country_id')
+            ->count();
+
+        $this->assertEquals(0, $count);
+    }
+
+    /** @test */
+    public function test_all_cities_have_country_id()
+    {
+        $count = City::query()
+            ->whereNull('country_id')
+            ->count();
+
+        $this->assertEquals(0, $count);
+    }
+
+    /** @test */
+    public function test_all_cities_have_state_id()
+    {
+        $count = City::query()
+            ->whereNull('state_id')
+            ->count();
+
+        $this->assertEquals(0, $count);
+    }
+
 }
 

tests/TestCase.php

@@ -3,9 +3,10 @@
 namespace Ichtrojan\Location\Test;
 
 use Ichtrojan\Location\LocationServiceProvider;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
+use Ichtrojan\Location\Seeds\CountriesTableSeeder;
+use Ichtrojan\Location\Seeds\StatesTableSeeder;
+use Ichtrojan\Location\Seeds\CitiesTableSeeder;
+use Ichtrojan\Location\Seeds\StateCityCountrySeeder;
 use Illuminate\Encryption\Encrypter;
 use Illuminate\Foundation\Testing\TestCase as BaseTestCase;
 use Orchestra\Testbench\Concerns\CreatesApplication;
@@ -51,6 +52,12 @@ protected function getEnvironmentSetUp($app)
         $app['config']->set('app.key', 'base64:' . base64_encode(
                 Encrypter::generateKey($app['config']['app.cipher'])
             ));
+
+        $app['config']->set('location.states_table', 'states');
+        $app['config']->set('location.cities_table', 'cities');
+        $app['config']->set('location.countries_table', 'countries');
+        $app['config']->set('location.routes.prefix', 'location');
+        $app['config']->set('location.routes.middleware', 'web');
     }
 
     /**
@@ -96,26 +103,22 @@ protected function addCountryColumnToCitiesTable()
 
     protected function seedCountriesTable()
     {
-        include_once __DIR__ . '/../publishable/database/seeds/CountriesTableSeeder.php';
-        (new \CountriesTableSeeder())->run();
+        (new CountriesTableSeeder())->run();
     }
 
     protected function seedStatesTable()
     {
-        include_once __DIR__ . '/../publishable/database/seeds/StatesTableSeeder.php';
-        (new \StatesTableSeeder())->run();
+        (new StatesTableSeeder())->run();
     }
 
     protected function seedCitiesTable()
     {
-        include_once __DIR__ . '/../publishable/database/seeds/CitiesTableSeeder.php';
-        (new \CitiesTableSeeder())->run();
+        (new CitiesTableSeeder())->run();
     }
 
     protected function updateCitiesTable()
     {
-        include_once __DIR__ . '/../publishable/database/seeds/StateCityCountrySeeder.php';
-        (new \StateCityCountrySeeder())->run();
+        (new StateCityCountrySeeder())->run();
     }
 
 }