Merge branch 'yang-fix-test' into yang

package-lock.json

@@ -8845,7 +8845,7 @@
         },
         "socket.io-client": {
             "version": "2.3.0",
-            "resolved": "https://registry.npm.taobao.org/socket.io-client/download/socket.io-client-2.3.0.tgz",
+            "resolved": "https://registry.npm.taobao.org/socket.io-client/download/socket.io-client-2.3.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsocket.io-client%2Fdownload%2Fsocket.io-client-2.3.0.tgz",
             "integrity": "sha1-FNW6LgC5vNFFrkQ6uWs/hsvMG7Q=",
             "requires": {
                 "backo2": "1.0.2",

tests/Services/BatchService/TestGetBatchByCodes.php

@@ -9,8 +9,6 @@ use Tests\TestCase;
 
 class TestGetBatchByCodes extends TestCase
 {
-//    use RefreshDatabase;
-
     /** @var BatchService $service */
     private $service;
     private $data = [];

tests/Services/CityService/FindByNameTest.php

@@ -10,8 +10,6 @@ use Tests\TestCase;
 
 class FindByNameTest extends TestCase
 {
-    use RefreshDatabase;
-
     /** @var CityService $cityService */
     public $cityService;
 

tests/Services/LogisticService/GetLogisticByCodeTest.php

@@ -10,8 +10,6 @@ use Tests\TestCase;
 
 class GetLogisticByCodeTest extends TestCase
 {
-    use RefreshDatabase;
-
     /** @var LogisticService $service */
     private $service;
     private $data = [];

tests/Services/LogisticService/GetLogisticByCodesTest.php

@@ -11,8 +11,6 @@ use Tests\TestCase;
 
 class GetLogisticByCodesTest extends TestCase
 {
-    use RefreshDatabase;
-
     /** @var LogisticService $service */
     private $service;
     private $data;

tests/Services/LogisticTimingService/FindByParamsTest.php

@@ -11,8 +11,6 @@ use Tests\TestCase;
 
 class FindByParamsTest extends TestCase
 {
-    use RefreshDatabase;
-
     /**
      * @var LogisticTimingService $logisticTimingService
      */

tests/Services/NewOrderCountingRecordService/OrderCountingRecordsTest.php

@@ -33,7 +33,8 @@ class OrderCountingRecordsTest extends TestCase
         parent::setUp(); // TODO: Change the autogenerated stub
         cache()->flush();
         $this->newOrderCountingRecordService = new NewOrderCountingRecordService();
-        $this->actingAs(factory(User::class)->create(['name' => 'yang']));
+        $user = User::query()->where('name', 'yang')->first();
+        $this->actingAs($user);
         $owners = factory(Owner::class)->times(2)->create();
         $this->ownerIds = array_column($owners->toArray(), 'id');
         $this->queryConditionDay = $this->newOrderCountingRecordService->transfersToCondition(Carbon::now()->subDays($this->step_length)->toDateString(), Carbon::now()->toDateString(), '日', $this->ownerIds);

tests/Services/NewOrderCountingRecordService/TransfersToConditionsTest.php

@@ -22,7 +22,8 @@ class TransfersToConditionsTest extends TestCase
         parent::setUp(); // TODO: Change the autogenerated stub
         cache()->flush();
         $this->newOrderCountingRecordService = new NewOrderCountingRecordService();
-        $this->actingAs(factory(User::class)->create(['name' => 'yang']));
+        $user = User::query()->where('name', 'yang')->first();
+        $this->actingAs($user);
         $this->data['dates'] = [
             'right'=>[
                 ['startAt'=>Carbon::now()->subDays(2),'endAt'=>Carbon::now()->addDays(2)],

tests/Services/OracleDOCOrderHeaderService/GetWMSOrderOnEditDateTest.php

@@ -12,7 +12,6 @@ use Tests\TestCase;
 
 class GetWMSOrderOnEditDateTest extends TestCase
 {
-    use RefreshDatabase;
     /** @var OracleDOCOrderHeaderService $service */
     private $service;
 

tests/Services/OracleDOCOrderHeaderService/GetWMSOrderOnStartDateTest.php

@@ -12,7 +12,6 @@ use Tests\TestCase;
 
 class GetWMSOrderOnStartDateTest extends TestCase
 {
-    use RefreshDatabase;
     /** @var OracleDOCOrderHeaderService $service */
     public $service;
 

tests/Services/OracleDOCOrderHeaderService/GetWmsOrderOnStartDateEditTest.php

@@ -12,8 +12,6 @@ use Tests\TestCase;
 
 class GetWmsOrderOnStartDateEditTest extends TestCase
 {
-    use RefreshDatabase;
-
     /** @var OracleDOCOrderHeaderService $service */
     public $service;
 

tests/Services/OracleDOCOrderHeaderService/GetWmsOrderOnstartDateCreateTest.php

@@ -13,7 +13,6 @@ use Tests\TestCase;
 
 class GetWmsOrderOnstartDateCreateTest extends TestCase
 {
-    use RefreshDatabase;
     /** @var OracleDOCOrderHeaderService $service */
     public $service;
 

tests/Services/OrderCommodityService/GetReGroupActAllocationDetailsTest.php

@@ -12,8 +12,6 @@ use Tests\TestCase;
 
 class GetReGroupActAllocationDetailsTest extends TestCase
 {
-//    use RefreshDatabase;
-
     /** @var OrderCommodityService  $service */
     private $service;
     private $data;

tests/Services/OrderCommodityService/SyncOrderCommodityTest.php

@@ -17,8 +17,6 @@ use Tests\TestCase;
 
 class SyncOrderCommodityTest extends TestCase
 {
-//    use RefreshDatabase;
-
     /** @var OrderCommodityService $service */
     private $service;
     private $data = [];

tests/Services/OrderIssueService/GetRecycleBinPaginateTest.php

@@ -9,7 +9,6 @@ use Tests\TestCase;
 
 class GetRecycleBinPaginateTest extends TestCase
 {
-    use RefreshDatabase;
     /**
      * @var OrderIssueService $service
      */

tests/Services/OrderIssueService/OrderIssueTagTest.php

@@ -13,7 +13,6 @@ use Tests\TestCase;
 
 class OrderIssueTagTest extends TestCase
 {
-    use RefreshDatabase;
     /** @var OrderIssueService $service */
     public $service;
     public function setUp(): void

tests/Services/OrderIssueService/RecoverOrderIssueTest.php

@@ -10,7 +10,6 @@ use Tests\TestCase;
 
 class RecoverOrderIssueTest extends TestCase
 {
-    use RefreshDatabase;
     /**
      * @var OrderIssueService $service
      */

tests/Services/OrderPackageCommoditiesService/RegroupOrderCommoditiesTest.php

@@ -20,8 +20,6 @@ use Tests\TestCase;
 
 class RegroupOrderCommoditiesTest extends TestCase
 {
-    use RefreshDatabase;
-
     /**
      * @var OrderPackageCommoditiesService $service
      */

tests/Services/StoreService/CreateStoreTest.php

@@ -16,7 +16,6 @@ use Tests\TestCase;
 
 class CreateStoreTest extends TestCase
 {
-//    use RefreshDatabase;
     /** @var StoreService $service */
     public $service;
     public $asnHeaders;

tests/Unit/CustomerLogTest.php

@@ -8,8 +8,6 @@ use Tests\TestCase;
 
 class CustomerLogTest extends TestCase
 {
-    use RefreshDatabase;
-
     /**
      * @test
      */