Merge pull request #2703 from Toflar/optional-mongodb-tests

teohhanhui · web-flow · commit 09e80060758a · 2019-05-03T15:25:58.000+02:00
Removed hard dependencies on doctrine odm to run the tests
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -13,6 +13,10 @@ reusable-steps:
     run:
       name: Disable Xdebug PHP extension
       command: sudo rm /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
+  - &install-doctrine-mongodb-odm
+    run:
+      name: Install Doctrine MongoDB ODM
+      command: composer require --prefer-dist --no-progress --no-suggest --no-update --ansi doctrine/mongodb-odm:^2.0.0@beta doctrine/mongodb-odm-bundle:^4.0.0@beta
   - &install-php-extensions
     run:
       name: Install PHP extensions
@@ -134,6 +138,7 @@ jobs:
       - *disable-php-memory-limit
       - *install-php-extensions
       - *update-composer
+      - *install-doctrine-mongodb-odm
       - *update-project-dependencies
       - *save-composer-cache-by-revision
       - *save-composer-cache-by-branch
diff --git a/.travis.yml b/.travis.yml
@@ -8,10 +8,6 @@ cache:
 jobs:
   include:
     - php: '7.1'
-      env: NO_UNIT_TESTS=true
-      before_install:
-        - composer remove --dev ext-mongodb doctrine/mongodb-odm doctrine/mongodb-odm-bundle
-        - sed -i '33,39d' tests/Fixtures/app/config/config_common.yml
     - php: '7.2'
     - php: '7.3'
     - php: '7.3'
@@ -46,12 +42,15 @@ before_install:
   - if [[ $APP_ENV = 'elasticsearch' ]]; then
       curl -O https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.5.0.deb && sudo dpkg -i --force-confnew elasticsearch-6.5.0.deb && sudo service elasticsearch restart;
     fi
-  - phpenv config-rm xdebug.ini || echo "xdebug not available"
   - echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
-  - echo "extension=mongodb.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+  - if [[ $APP_ENV = 'mongodb' ]]; then
+      echo "extension=mongodb.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/mongodb.ini;
+    fi
+  - phpenv config-rm xdebug.ini || echo "xdebug not available"
   - export PATH="$PATH:$HOME/.composer/vendor/bin"
 
 install:
+  - if [[ $APP_ENV = 'mongodb' ]]; then composer require --prefer-dist --no-progress --no-suggest --no-update --ansi doctrine/mongodb-odm:^2.0.0@beta doctrine/mongodb-odm-bundle:^4.0.0@beta; fi
   - if [[ $deps = 'low' ]]; then
       composer update --prefer-dist --no-progress --no-suggest --prefer-stable --prefer-lowest --ansi;
     else
@@ -60,11 +59,10 @@ install:
 
 script:
   - tests/Fixtures/app/console cache:clear
-  - if [[ $NO_UNIT_TESTS != true ]]; then
-      vendor/bin/phpunit;
-    fi
   - if [[ $APP_ENV = 'mongodb' ]]; then
       vendor/bin/phpunit -c phpunit.mongo.xml;
+    else
+      vendor/bin/phpunit;
     fi
   - tests/Fixtures/app/console cache:clear
   - if [[ $APP_ENV = 'postgres' ]]; then
diff --git a/composer.json b/composer.json
@@ -35,8 +35,6 @@
         "doctrine/annotations": "^1.2",
         "doctrine/doctrine-bundle": "^1.8",
         "doctrine/doctrine-cache-bundle": "^1.3.5",
-        "doctrine/mongodb-odm": "^2.0.0@beta",
-        "doctrine/mongodb-odm-bundle": "^4.0.0@beta",
         "doctrine/orm": "^2.6.3",
         "elasticsearch/elasticsearch": "^6.0",
         "friendsofsymfony/user-bundle": "^2.2@dev",
diff --git a/phpunit.mongo.xml b/phpunit.mongo.xml
@@ -13,7 +13,7 @@
         <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak_vendors" />
         <server name="KERNEL_DIR" value="tests/Fixtures/app/" />
         <server name="KERNEL_CLASS" value="AppKernel" />
-        <server name="APP_ENV" value="test_mongodb" />
+        <server name="APP_ENV" value="mongodb" />
         <server name="LEGACY" value="0" />
     </php>
 
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -37,4 +37,10 @@
     <listeners>
         <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
     </listeners>
+
+    <groups>
+        <exclude>
+            <group>mongodb</group>
+        </exclude>
+    </groups>
 </phpunit>
diff --git a/tests/Bridge/Doctrine/Common/Util/IdentifierManagerTraitTest.php b/tests/Bridge/Doctrine/Common/Util/IdentifierManagerTraitTest.php
@@ -70,6 +70,7 @@ public function testSingleIdentifier()
 
     /**
      * @group legacy
+     * @group mongodb
      */
     public function testSingleDocumentIdentifier()
     {
diff --git a/tests/Bridge/Doctrine/MongoDbOdm/CollectionDataProviderTest.php b/tests/Bridge/Doctrine/MongoDbOdm/CollectionDataProviderTest.php
@@ -27,6 +27,8 @@
 use PHPUnit\Framework\TestCase;
 
 /**
+ * @group mongodb
+ *
  * @author Alan Poulain <contact@alanpoulain.eu>
  */
 class CollectionDataProviderTest extends TestCase
diff --git a/tests/Bridge/Doctrine/MongoDbOdm/Extension/FilterExtensionTest.php b/tests/Bridge/Doctrine/MongoDbOdm/Extension/FilterExtensionTest.php
@@ -24,6 +24,8 @@
 use Psr\Container\ContainerInterface;
 
 /**
+ * @group mongodb
+ *
  * @author Alan Poulain <contact@alanpoulain.eu>
  */
 class FilterExtensionTest extends TestCase
diff --git a/tests/Bridge/Doctrine/MongoDbOdm/Extension/OrderExtensionTest.php b/tests/Bridge/Doctrine/MongoDbOdm/Extension/OrderExtensionTest.php
@@ -25,6 +25,8 @@
 use PHPUnit\Framework\TestCase;
 
 /**
+ * @group mongodb
+ *
  * @author Alan Poulain <contact@alanpoulain.eu>
  */
 class OrderExtensionTest extends TestCase
diff --git a/tests/Bridge/Doctrine/MongoDbOdm/Extension/PaginationExtensionTest.php b/tests/Bridge/Doctrine/MongoDbOdm/Extension/PaginationExtensionTest.php
@@ -34,6 +34,8 @@
 use PHPUnit\Framework\TestCase;
 
 /**
+ * @group mongodb
+ *
  * @author Alan Poulain <contact@alanpoulain.eu>
  */
 class PaginationExtensionTest extends TestCase
diff --git a/tests/Bridge/Doctrine/MongoDbOdm/Filter/BooleanFilterTest.php b/tests/Bridge/Doctrine/MongoDbOdm/Filter/BooleanFilterTest.php
@@ -18,6 +18,8 @@
 use ApiPlatform\Core\Tests\Bridge\Doctrine\Common\Filter\BooleanFilterTestTrait;
 
 /**
+ * @group mongodb
+ *
  * @author Alan Poulain <contact@alanpoulain.eu>
  */
 class BooleanFilterTest extends DoctrineMongoDbOdmFilterTestCase
diff --git a/tests/Bridge/Doctrine/MongoDbOdm/Filter/DateFilterTest.php b/tests/Bridge/Doctrine/MongoDbOdm/Filter/DateFilterTest.php
@@ -19,6 +19,8 @@
 use MongoDB\BSON\UTCDateTime;
 
 /**
+ * @group mongodb
+ *
  * @author Alan Poulain <contact@alanpoulain.eu>
  */
 class DateFilterTest extends DoctrineMongoDbOdmFilterTestCase
diff --git a/tests/Bridge/Doctrine/MongoDbOdm/Filter/ExistsFilterTest.php b/tests/Bridge/Doctrine/MongoDbOdm/Filter/ExistsFilterTest.php
@@ -18,6 +18,8 @@
 use ApiPlatform\Core\Tests\Bridge\Doctrine\Common\Filter\ExistsFilterTestTrait;
 
 /**
+ * @group mongodb
+ *
  * @author Alan Poulain <contact@alanpoulain.eu>
  */
 class ExistsFilterTest extends DoctrineMongoDbOdmFilterTestCase
diff --git a/tests/Bridge/Doctrine/MongoDbOdm/Filter/NumericFilterTest.php b/tests/Bridge/Doctrine/MongoDbOdm/Filter/NumericFilterTest.php
@@ -18,6 +18,8 @@
 use ApiPlatform\Core\Tests\Bridge\Doctrine\Common\Filter\NumericFilterTestTrait;
 
 /**
+ * @group mongodb
+ *
  * @author Alan Poulain <contact@alanpoulain.eu>
  */
 class NumericFilterTest extends DoctrineMongoDbOdmFilterTestCase
diff --git a/tests/Bridge/Doctrine/MongoDbOdm/Filter/OrderFilterTest.php b/tests/Bridge/Doctrine/MongoDbOdm/Filter/OrderFilterTest.php
@@ -19,6 +19,8 @@
 use Doctrine\Common\Persistence\ManagerRegistry;
 
 /**
+ * @group mongodb
+ *
  * @author Alan Poulain <contact@alanpoulain.eu>
  */
 class OrderFilterTest extends DoctrineMongoDbOdmFilterTestCase
diff --git a/tests/Bridge/Doctrine/MongoDbOdm/Filter/RangeFilterTest.php b/tests/Bridge/Doctrine/MongoDbOdm/Filter/RangeFilterTest.php
@@ -18,6 +18,8 @@
 use ApiPlatform\Core\Tests\Bridge\Doctrine\Common\Filter\RangeFilterTestTrait;
 
 /**
+ * @group mongodb
+ *
  * @author Alan Poulain <contact@alanpoulain.eu>
  */
 class RangeFilterTest extends DoctrineMongoDbOdmFilterTestCase
diff --git a/tests/Bridge/Doctrine/MongoDbOdm/Filter/SearchFilterTest.php b/tests/Bridge/Doctrine/MongoDbOdm/Filter/SearchFilterTest.php
@@ -24,6 +24,8 @@
 use Prophecy\Argument;
 
 /**
+ * @group mongodb
+ *
  * @author Alan Poulain <contact@alanpoulain.eu>
  */
 class SearchFilterTest extends DoctrineMongoDbOdmFilterTestCase
diff --git a/tests/Bridge/Doctrine/MongoDbOdm/ItemDataProviderTest.php b/tests/Bridge/Doctrine/MongoDbOdm/ItemDataProviderTest.php
@@ -36,6 +36,8 @@
 use PHPUnit\Framework\TestCase;
 
 /**
+ * @group mongodb
+ *
  * @author Alan Poulain <contact@alanpoulain.eu>
  */
 class ItemDataProviderTest extends TestCase
diff --git a/tests/Bridge/Doctrine/MongoDbOdm/Metadata/Property/DoctrineMongoDbOdmPropertyMetadataFactoryTest.php b/tests/Bridge/Doctrine/MongoDbOdm/Metadata/Property/DoctrineMongoDbOdmPropertyMetadataFactoryTest.php
@@ -23,6 +23,8 @@
 use PHPUnit\Framework\TestCase;
 
 /**
+ * @group mongodb
+ *
  * @author Alan Poulain <contact@alanpoulain.eu>
  */
 class DoctrineMongoDbOdmPropertyMetadataFactoryTest extends TestCase
diff --git a/tests/Bridge/Doctrine/MongoDbOdm/PaginatorTest.php b/tests/Bridge/Doctrine/MongoDbOdm/PaginatorTest.php
@@ -20,6 +20,9 @@
 use Doctrine\ODM\MongoDB\UnitOfWork;
 use PHPUnit\Framework\TestCase;
 
+/**
+ * @group mongodb
+ */
 class PaginatorTest extends TestCase
 {
     /**
diff --git a/tests/Bridge/Doctrine/MongoDbOdm/PropertyInfo/DoctrineExtractorTest.php b/tests/Bridge/Doctrine/MongoDbOdm/PropertyInfo/DoctrineExtractorTest.php
@@ -27,6 +27,8 @@
 use Symfony\Component\PropertyInfo\Type;
 
 /**
+ * @group mongodb
+ *
  * @author Kévin Dunglas <dunglas@gmail.com>
  * @author Alan Poulain <contact@alanpoulain.eu>
  */
diff --git a/tests/Bridge/Doctrine/MongoDbOdm/SubresourceDataProviderTest.php b/tests/Bridge/Doctrine/MongoDbOdm/SubresourceDataProviderTest.php
@@ -39,6 +39,8 @@
 use Prophecy\Argument;
 
 /**
+ * @group mongodb
+ *
  * @author Alan Poulain <contact@alanpoulain.eu>
  */
 class SubresourceDataProviderTest extends TestCase
diff --git a/tests/Bridge/Symfony/Bundle/DependencyInjection/ApiPlatformExtensionTest.php b/tests/Bridge/Symfony/Bundle/DependencyInjection/ApiPlatformExtensionTest.php
diff --git a/tests/Bridge/Symfony/Bundle/DependencyInjection/ConfigurationTest.php b/tests/Bridge/Symfony/Bundle/DependencyInjection/ConfigurationTest.php
diff --git a/tests/Bridge/Symfony/Bundle/Twig/ApiPlatformProfilerPanelTest.php b/tests/Bridge/Symfony/Bundle/Twig/ApiPlatformProfilerPanelTest.php
diff --git a/tests/Fixtures/app/config/config_common.yml b/tests/Fixtures/app/config/config_common.yml
diff --git a/tests/Fixtures/app/config/config_mongodb.yml b/tests/Fixtures/app/config/config_mongodb.yml
diff --git a/tests/Fixtures/app/config/config_services_mongodb.yml b/tests/Fixtures/app/config/config_services_mongodb.yml
diff --git a/tests/Fixtures/app/config/config_test_mongodb.yml b/tests/Fixtures/app/config/config_test_mongodb.yml
diff --git a/tests/Fixtures/app/config/routing_mongodb.yml b/tests/Fixtures/app/config/routing_mongodb.yml
diff --git a/tests/Fixtures/app/config/routing_test_mongodb.yml b/tests/Fixtures/app/config/routing_test_mongodb.yml

Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,7 @@ public function testSingleIdentifier()`
`70`	`70`
`71`	`71`	`/**`
`72`	`72`	`* @group legacy`
	`73`	`+ * @group mongodb`
`73`	`74`	`*/`
`74`	`75`	`public function testSingleDocumentIdentifier()`
`75`	`76`	`{`