unit test fix

z-song · z-song · commit a451b52e5e2b · 2020-03-04T19:35:14.000+08:00
diff --git a/composer.json b/composer.json
@@ -19,12 +19,10 @@
         "doctrine/dbal": "2.*"
     },
     "require-dev": {
-        "phpunit/phpunit": "~6.0|~8.0",
         "laravel/laravel": ">=5.5",
-        "symfony/css-selector": "~3.1",
         "fzaninotto/faker": "~1.4",
         "intervention/image": "~2.3",
-        "laravel/browser-kit-testing": "^2.0"
+        "laravel/browser-kit-testing": "^6.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -8,7 +8,6 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="true"
-         syntaxCheck="false"
          verbose="true"
         >
     <testsuites>
diff --git a/src/Form/Field/Map.php b/src/Form/Field/Map.php
@@ -6,6 +6,11 @@
 
 class Map extends Field
 {
+    protected $value = [
+        'lat' => null,
+        'lng' => null
+    ];
+
     /**
      * Column name.
      *
diff --git a/tests/FileUploadTest.php b/tests/FileUploadTest.php
@@ -6,7 +6,7 @@
 
 class FileUploadTest extends TestCase
 {
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -16,7 +16,7 @@ public function setUp()
     public function testFileUploadPage()
     {
         $this->visit('admin/files/create')
-            ->see('Upload file')
+            ->see('Files')
             ->seeInElement('h3[class=box-title]', 'Create')
             ->seeElement('input[name=file1]')
             ->seeElement('input[name=file2]')
diff --git a/tests/ImageUploadTest.php b/tests/ImageUploadTest.php
@@ -7,7 +7,7 @@
 
 class ImageUploadTest extends TestCase
 {
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -23,7 +23,7 @@ public function testDisableFilter()
     public function testImageUploadPage()
     {
         $this->visit('admin/images/create')
-            ->see('Upload image')
+            ->see('Images')
             ->seeInElement('h3[class=box-title]', 'Create')
             ->seeElement('input[name=image1]')
             ->seeElement('input[name=image2]')
@@ -177,7 +177,7 @@ public function testUploadMultipleImage()
         $path = __DIR__.'/assets/test.jpg';
 
         $file = new \Illuminate\Http\UploadedFile(
-            $path, 'test.jpg', 'image/jpeg', filesize($path), null, true
+            $path, 'test.jpg', 'image/jpeg', null, true
         );
 
         $size = rand(10, 20);
@@ -213,7 +213,7 @@ public function testRemoveMultipleFiles()
         $path = __DIR__.'/assets/test.jpg';
 
         $file = new \Illuminate\Http\UploadedFile(
-            $path, 'test.jpg', 'image/jpeg', filesize($path), null, true
+            $path, 'test.jpg', 'image/jpeg', null, true
         );
 
         $size = rand(10, 20);
diff --git a/tests/IndexTest.php b/tests/IndexTest.php
@@ -4,7 +4,7 @@
 
 class IndexTest extends TestCase
 {
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/MenuTest.php b/tests/MenuTest.php
@@ -5,7 +5,7 @@
 
 class MenuTest extends TestCase
 {
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/ModelTreeTest.php b/tests/ModelTreeTest.php
@@ -4,7 +4,7 @@
 
 class ModelTreeTest extends TestCase
 {
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
     }
diff --git a/tests/OperationLogTest.php b/tests/OperationLogTest.php
@@ -5,7 +5,7 @@
 
 class OperationLogTest extends TestCase
 {
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/PermissionsTest.php b/tests/PermissionsTest.php
@@ -6,7 +6,7 @@
 
 class PermissionsTest extends TestCase
 {
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/RolesTest.php b/tests/RolesTest.php
@@ -5,7 +5,7 @@
 
 class RolesTest extends TestCase
 {
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -31,7 +31,7 @@ public function createApplication()
         return $app;
     }
 
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -65,9 +65,13 @@ public function setUp()
         require __DIR__.'/routes.php';
 
         require __DIR__.'/seeds/factory.php';
+
+//        \Encore\Admin\Admin::$css = [];
+//        \Encore\Admin\Admin::$js = [];
+//        \Encore\Admin\Admin::$script = [];
     }
 
-    public function tearDown()
+    protected function tearDown(): void
     {
         (new CreateAdminTables())->down();
 
diff --git a/tests/UserFormTest.php b/tests/UserFormTest.php
@@ -5,7 +5,7 @@
 
 class UserFormTest extends TestCase
 {
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/UserGridTest.php b/tests/UserGridTest.php
@@ -6,7 +6,7 @@
 
 class UserGridTest extends TestCase
 {
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -16,7 +16,7 @@ public function setUp()
     public function testIndexPage()
     {
         $this->visit('admin/users')
-            ->see('All users')
+            ->see('Users')
             ->seeInElement('tr th', 'Username')
             ->seeInElement('tr th', 'Email')
             ->seeInElement('tr th', 'Mobile')
@@ -66,7 +66,7 @@ public function testGridWithData()
         $this->seedsTable();
 
         $this->visit('admin/users')
-            ->see('All users');
+            ->see('Users');
 
         $this->assertCount(100, UserModel::all());
         $this->assertCount(100, ProfileModel::all());
@@ -77,7 +77,7 @@ public function testGridPagination()
         $this->seedsTable(65);
 
         $this->visit('admin/users')
-            ->see('All users');
+            ->see('Users');
 
         $this->visit('admin/users?page=2');
         $this->assertCount(20, $this->crawler()->filter('td a i[class*=fa-edit]'));
@@ -114,7 +114,7 @@ public function testEqualFilter()
         $this->seedsTable(50);
 
         $this->visit('admin/users')
-            ->see('All users');
+            ->see('Users');
 
         $this->assertCount(50, UserModel::all());
         $this->assertCount(50, ProfileModel::all());
@@ -142,7 +142,7 @@ public function testLikeFilter()
         $this->seedsTable(50);
 
         $this->visit('admin/users')
-            ->see('All users');
+            ->see('Users');
 
         $this->assertCount(50, UserModel::all());
         $this->assertCount(50, ProfileModel::all());
diff --git a/tests/UserSettingTest.php b/tests/UserSettingTest.php
@@ -5,7 +5,7 @@
 
 class UserSettingTest extends TestCase
 {
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/UsersTest.php b/tests/UsersTest.php
@@ -6,7 +6,7 @@ class UsersTest extends TestCase
 {
     protected $user;
 
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/controllers/FileController.php b/tests/controllers/FileController.php
@@ -2,63 +2,14 @@
 
 namespace Tests\Controllers;
 
-use App\Http\Controllers\Controller;
-use Encore\Admin\Controllers\ModelForm;
-use Encore\Admin\Facades\Admin;
+use Encore\Admin\Controllers\AdminController;
 use Encore\Admin\Form;
 use Encore\Admin\Grid;
-use Encore\Admin\Layout\Content;
 use Tests\Models\File;
 
-class FileController extends Controller
+class FileController extends AdminController
 {
-    use ModelForm;
-
-    /**
-     * Index interface.
-     *
-     * @return Content
-     */
-    public function index()
-    {
-        return Admin::content(function (Content $content) {
-            $content->header('header');
-            $content->description('description');
-
-            $content->body($this->grid());
-        });
-    }
-
-    /**
-     * Edit interface.
-     *
-     * @param $id
-     *
-     * @return Content
-     */
-    public function edit($id)
-    {
-        return Admin::content(function (Content $content) use ($id) {
-            $content->header('header');
-            $content->description('description');
-
-            $content->body($this->form()->edit($id));
-        });
-    }
-
-    /**
-     * Create interface.
-     *
-     * @return Content
-     */
-    public function create()
-    {
-        return Admin::content(function (Content $content) {
-            $content->header('Upload file');
-
-            $content->body($this->form());
-        });
-    }
+    protected $title = 'Files';
 
     /**
      * Make a grid builder.
@@ -67,12 +18,14 @@ public function create()
      */
     protected function grid()
     {
-        return Admin::grid(File::class, function (Grid $grid) {
-            $grid->id('ID')->sortable();
+        $grid = new Grid(new File());
+
+        $grid->id('ID')->sortable();
 
-            $grid->created_at();
-            $grid->updated_at();
-        });
+        $grid->created_at();
+        $grid->updated_at();
+
+        return $grid;
     }
 
     /**
@@ -82,18 +35,20 @@ protected function grid()
      */
     protected function form()
     {
-        return Admin::form(File::class, function (Form $form) {
-            $form->display('id', 'ID');
+        $form = new Form(new File());
+
+        $form->display('id', 'ID');
+
+        $form->file('file1');
+        $form->file('file2');
+        $form->file('file3');
+        $form->file('file4');
+        $form->file('file5');
+        $form->file('file6');
 
-            $form->file('file1');
-            $form->file('file2');
-            $form->file('file3');
-            $form->file('file4');
-            $form->file('file5');
-            $form->file('file6');
+        $form->display('created_at', 'Created At');
+        $form->display('updated_at', 'Updated At');
 
-            $form->display('created_at', 'Created At');
-            $form->display('updated_at', 'Updated At');
-        });
+        return $form;
     }
 }
diff --git a/tests/controllers/ImageController.php b/tests/controllers/ImageController.php
diff --git a/tests/controllers/MultipleImageController.php b/tests/controllers/MultipleImageController.php
diff --git a/tests/controllers/UserController.php b/tests/controllers/UserController.php

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`convertWarningsToExceptions="true"`
`9`	`9`	`processIsolation="false"`
`10`	`10`	`stopOnFailure="true"`
`11`		`- syntaxCheck="false"`
`12`	`11`	`verbose="true"`
`13`	`12`	`>`
`14`	`13`	`<testsuites>`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,11 @@`
`6`	`6`
`7`	`7`	`class Map extends Field`
`8`	`8`	`{`
	`9`	`+ protected $value = [`
	`10`	`+ 'lat' => null,`
	`11`	`+ 'lng' => null`
	`12`	`+ ];`
	`13`	`+`
`9`	`14`	`/**`
`10`	`15`	`* Column name.`
`11`	`16`	`*`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`class FileUploadTest extends TestCase`
`8`	`8`	`{`
`9`		`- public function setUp()`
	`9`	`+ protected function setUp(): void`
`10`	`10`	`{`
`11`	`11`	`parent::setUp();`
`12`	`12`
`@@ -16,7 +16,7 @@ public function setUp()`
`16`	`16`	`public function testFileUploadPage()`
`17`	`17`	`{`
`18`	`18`	`$this->visit('admin/files/create')`
`19`		`- ->see('Upload file')`
	`19`	`+ ->see('Files')`
`20`	`20`	`->seeInElement('h3[class=box-title]', 'Create')`
`21`	`21`	`->seeElement('input[name=file1]')`
`22`	`22`	`->seeElement('input[name=file2]')`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`class IndexTest extends TestCase`
`6`	`6`	`{`
`7`		`- public function setUp()`
	`7`	`+ protected function setUp(): void`
`8`	`8`	`{`
`9`	`9`	`parent::setUp();`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`class MenuTest extends TestCase`
`7`	`7`	`{`
`8`		`- public function setUp()`
	`8`	`+ protected function setUp(): void`
`9`	`9`	`{`
`10`	`10`	`parent::setUp();`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`class ModelTreeTest extends TestCase`
`6`	`6`	`{`
`7`		`- public function setUp()`
	`7`	`+ protected function setUp(): void`
`8`	`8`	`{`
`9`	`9`	`parent::setUp();`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`class OperationLogTest extends TestCase`
`7`	`7`	`{`
`8`		`- public function setUp()`
	`8`	`+ protected function setUp(): void`
`9`	`9`	`{`
`10`	`10`	`parent::setUp();`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`class PermissionsTest extends TestCase`
`8`	`8`	`{`
`9`		`- public function setUp()`
	`9`	`+ protected function setUp(): void`
`10`	`10`	`{`
`11`	`11`	`parent::setUp();`
`12`	`12`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`class RolesTest extends TestCase`
`7`	`7`	`{`
`8`		`- public function setUp()`
	`8`	`+ protected function setUp(): void`
`9`	`9`	`{`
`10`	`10`	`parent::setUp();`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public function createApplication()`
`31`	`31`	`return $app;`
`32`	`32`	`}`
`33`	`33`
`34`		`- public function setUp()`
	`34`	`+ protected function setUp(): void`
`35`	`35`	`{`
`36`	`36`	`parent::setUp();`
`37`	`37`
`@@ -65,9 +65,13 @@ public function setUp()`
`65`	`65`	`require __DIR__.'/routes.php';`
`66`	`66`
`67`	`67`	`require __DIR__.'/seeds/factory.php';`
	`68`	`+`
	`69`	`+// \Encore\Admin\Admin::$css = [];`
	`70`	`+// \Encore\Admin\Admin::$js = [];`
	`71`	`+// \Encore\Admin\Admin::$script = [];`
`68`	`72`	`}`
`69`	`73`
`70`		`- public function tearDown()`
	`74`	`+ protected function tearDown(): void`
`71`	`75`	`{`
`72`	`76`	`(new CreateAdminTables())->down();`
`73`	`77`