fix bugs

yiisoft · Oct 11, 2020 · cb9e128 · cb9e128
1 parent 756825e
commit cb9e128
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 35 deletions.
diff --git a/tests/ActiveDataProviderTest.php b/tests/ActiveDataProviderTest.php
@@ -12,7 +12,6 @@ class ActiveDataProviderTest extends TestCase
     protected function setUp()
     {
         parent::setUp();
-        $this->mockApplication();
         $this->setUpTestRows();
     }
 

diff --git a/tests/ActiveFixtureTest.php b/tests/ActiveFixtureTest.php
@@ -10,11 +10,6 @@
 
 class ActiveFixtureTest extends TestCase
 {
-    protected function setUp()
-    {
-        parent::setUp();
-        $this->mockApplication();
-    }
 
     protected function tearDown()
     {

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -34,8 +34,7 @@ protected function setUp()
         if (!empty($config)) {
             $this->mongoDbConfig = $config;
         }
-        Yii::$app->setComponents(['mongodb' => $this->getConnection()]);
-        //$this->mockApplication();
+        $this->mockApplication();
     }
 
     protected function tearDown()
@@ -75,6 +74,9 @@ protected function mockApplication($config = [], $appClass = '\yii\console\Appli
             'basePath' => __DIR__,
             'vendorPath' => $this->getVendorPath(),
             'runtimePath' => dirname(__DIR__) . '/runtime',
+            'components' => [
+                'mongodb' => $this->getConnection(),
+            ],
         ], $config));
     }
 

diff --git a/tests/console/controllers/MigrateControllerTest.php b/tests/console/controllers/MigrateControllerTest.php
@@ -47,8 +47,6 @@ public function setUp()
         $this->migrationNamespace = 'yiiunit\extensions\mongodb\runtime\test_migrations';
 
         $this->setUpMigrationPath();
-
-        $this->mockApplication();
     }
 
     public function tearDown()

diff --git a/tests/file/StreamWrapperTest.php b/tests/file/StreamWrapperTest.php
@@ -35,12 +35,6 @@ public function testCreateFromDownload()
 
     public function testWriteResource()
     {
-        $this->mockApplication([
-            'components' => [
-                'mongodb' => yii::$app->mongodb
-            ],
-        ]);
-
         yii::$app->mongodb->registerFileStreamWrapper(true);
         $databaseName = yii::$app->mongodb->getDefaultDatabaseName();
 
@@ -59,12 +53,6 @@ public function testWriteResource()
 
     public function testReadResource()
     {
-        $this->mockApplication([
-            'components' => [
-                'mongodb' => yii::$app->mongodb
-            ],
-        ]);
-
         $collection = yii::$app->mongodb->getFileCollection();
         $upload = $collection->createUpload();
         $document = $upload->addContent('test content')->complete();
@@ -80,12 +68,6 @@ public function testReadResource()
 
     public function testSeek()
     {
-        $this->mockApplication([
-            'components' => [
-                'mongodb' => yii::$app->mongodb
-            ],
-        ]);
-
         yii::$app->mongodb->registerFileStreamWrapper(true);
         $databaseName = yii::$app->mongodb->getDefaultDatabaseName();
 

diff --git a/tests/validators/MongoDateValidatorTest.php b/tests/validators/MongoDateValidatorTest.php
@@ -12,7 +12,6 @@ class MongoDateValidatorTest extends TestCase
     protected function setUp()
     {
         parent::setUp();
-        $this->mockApplication();
         date_default_timezone_set('UTC');
     }
 

diff --git a/tests/validators/MongoIdValidatorTest.php b/tests/validators/MongoIdValidatorTest.php
@@ -9,12 +9,6 @@
 
 class MongoIdValidatorTest extends TestCase
 {
-    protected function setUp()
-    {
-        parent::setUp();
-        $this->mockApplication();
-    }
-
     public function testValidateValue()
     {
         $validator = new MongoIdValidator();