单元测试

update

tests/Controllers/UserController.php

@@ -8,7 +8,7 @@ use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Layout\Content;
 use Dcat\Admin\Show;
-use Tests\Models\Tag;
+use Dcat\Admin\Tests\Models\Tag;
 use Dcat\Admin\Tests\Repositories\User;
 
 class UserController extends Controller
@@ -82,7 +82,7 @@ class UserController extends Controller
     {
         $grid = new Grid(new User());
 
-        $grid->model()->with('tags');
+        $grid->model()->with(['tags', 'profile']);
 
         $grid->id('ID')->sortable();
 
@@ -94,13 +94,9 @@ class UserController extends Controller
             return "<img src='{$avatar}' />";
         });
         $grid->column('profile.postcode', 'Post code');
-//        $grid->profile()->address();
         $grid->column('profile.address');
-//        $grid->position('Position');
         $grid->column('profile.color');
-//        $grid->profile()->start_at('开始时间');
         $grid->column('profile.start_at', '开始时间');
-//        $grid->profile()->end_at('结束时间');
         $grid->column('profile.end_at', '结束时间');
 
         $grid->column('column1_not_in_table')->display(function () {

tests/Feature/UserFormTest.php

@@ -2,7 +2,9 @@
 
 namespace Dcat\Admin\Tests\Feature;
 
-use Tests\Models\User as UserModel;
+use Dcat\Admin\Tests\Models\Profile;
+use Dcat\Admin\Tests\Models\Tag;
+use Dcat\Admin\Tests\Models\User as UserModel;
 use Dcat\Admin\Tests\TestCase;
 
 /**
@@ -59,7 +61,6 @@ class UserFormTest extends TestCase
 
         $this->visit('admin/tests/users/create')
 //            ->attach(__DIR__.'/assets/test.jpg', 'avatar')
-
             ->submitForm('Submit', $data);
 
         $this->seePageIs('admin/tests/users')
@@ -100,11 +101,11 @@ class UserFormTest extends TestCase
 
     protected function seedsTable($count = 100)
     {
-        factory(\Tests\Models\User::class, $count)
+        factory(UserModel::class, $count)
             ->create()
             ->each(function ($u) {
-                $u->profile()->save(factory(\Tests\Models\Profile::class)->make());
-                $u->tags()->saveMany(factory(\Tests\Models\Tag::class, 5)->make());
+                $u->profile()->save(factory(Profile::class)->make());
+                $u->tags()->saveMany(factory(Tag::class, 5)->make());
             });
     }
 

tests/Feature/UserGridTest.php

@@ -2,8 +2,8 @@
 
 namespace Dcat\Admin\Tests\Feature;
 
-use Tests\Models\Profile as ProfileModel;
-use Tests\Models\User as UserModel;
+use Dcat\Admin\Tests\Models\Profile as ProfileModel;
+use Dcat\Admin\Tests\Models\User as UserModel;
 use Dcat\Admin\Tests\TestCase;
 
 /**
@@ -47,11 +47,11 @@ class UserGridTest extends TestCase
 
     protected function seedsTable($count = 100)
     {
-        factory(\Tests\Models\User::class, $count)
+        factory(\Dcat\Admin\Tests\Models\User::class, $count)
             ->create()
             ->each(function ($u) {
-                $u->profile()->save(factory(\Tests\Models\Profile::class)->make());
-                $u->tags()->saveMany(factory(\Tests\Models\Tag::class, 5)->make());
+                $u->profile()->save(factory(\Dcat\Admin\Tests\Models\Profile::class)->make());
+                $u->tags()->saveMany(factory(\Dcat\Admin\Tests\Models\Tag::class, 5)->make());
             });
     }
 
@@ -170,11 +170,11 @@ class UserGridTest extends TestCase
 
     public function testHasManyRelation()
     {
-        factory(\Tests\Models\User::class, 10)
+        factory(\Dcat\Admin\Tests\Models\User::class, 10)
             ->create()
             ->each(function ($u) {
-                $u->profile()->save(factory(\Tests\Models\Profile::class)->make());
-                $u->tags()->saveMany(factory(\Tests\Models\Tag::class, 5)->make());
+                $u->profile()->save(factory(\Dcat\Admin\Tests\Models\Profile::class)->make());
+                $u->tags()->saveMany(factory(\Dcat\Admin\Tests\Models\Tag::class, 5)->make());
             });
 
         $this->visit('admin/tests/users')

tests/Feature/UserShowTest.php

@@ -33,11 +33,11 @@ class UserShowTest extends TestCase
 
     protected function seedsTable($count = 100)
     {
-        factory(\Tests\Models\User::class, $count)
+        factory(\Dcat\Admin\Tests\Models\User::class, $count)
             ->create()
             ->each(function ($u) {
-                $u->profile()->save(factory(\Tests\Models\Profile::class)->make());
-                $u->tags()->saveMany(factory(\Tests\Models\Tag::class, 5)->make());
+                $u->profile()->save(factory(\Dcat\Admin\Tests\Models\Profile::class)->make());
+                $u->tags()->saveMany(factory(\Dcat\Admin\Tests\Models\Tag::class, 5)->make());
             });
     }
 }

tests/resources/seeds/UserTableSeeder.php

@@ -2,17 +2,20 @@
 
 namespace Tests\Seeds;
 
+use Dcat\Admin\Tests\Models\Profile;
+use Dcat\Admin\Tests\Models\Tag;
+use Dcat\Admin\Tests\Models\User;
 use Illuminate\Database\Seeder;
 
 class UserTableSeeder extends Seeder
 {
     public function run()
     {
-        factory(\Tests\Models\User::class, 50)
+        factory(User::class, 50)
             ->create()
             ->each(function ($u) {
-                $u->profile()->save(factory(\Tests\Models\Profile::class)->make());
-                $u->tags()->saveMany(factory(\Tests\Models\Tag::class, 5)->make());
+                $u->profile()->save(factory(Profile::class)->make());
+                $u->tags()->saveMany(factory(Tag::class, 5)->make());
             });
     }
 }

tests/resources/seeds/factory.php

@@ -5,7 +5,7 @@ use Illuminate\Database\Eloquent\Factory;
 
 $factory = app(Factory::class);
 
-$factory->define(Tests\Models\User::class, function (Faker $faker) {
+$factory->define(\Dcat\Admin\Tests\Models\User::class, function (Faker $faker) {
     return [
         'username' => $faker->userName,
         'email'    => $faker->email,
@@ -15,7 +15,7 @@ $factory->define(Tests\Models\User::class, function (Faker $faker) {
     ];
 });
 
-$factory->define(Tests\Models\Profile::class, function (Faker $faker) {
+$factory->define(\Dcat\Admin\Tests\Models\Profile::class, function (Faker $faker) {
     return [
         'first_name' => $faker->firstName,
         'last_name'  => $faker->lastName,
@@ -29,7 +29,7 @@ $factory->define(Tests\Models\Profile::class, function (Faker $faker) {
     ];
 });
 
-$factory->define(Tests\Models\Tag::class, function (Faker $faker) {
+$factory->define(\Dcat\Admin\Tests\Models\Tag::class, function (Faker $faker) {
     return [
         'name' => $faker->word,
     ];