Allow usage of channelContext in product url provider

stefandoorn · Jul 11, 2017 · 6b4ccaf · 6b4ccaf
1 parent 67e2812
commit 6b4ccaf
Show file tree

Hide file tree

Showing 12 changed files with 34 additions and 23 deletions.
diff --git a/tests/Controller/AbstractTestController.php b/tests/Controller/AbstractTestController.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Tests\SitemapPlugin\Controller;
+
+use Lakion\ApiTestCase\ApiTestCase;
+use Lakion\ApiTestCase\XmlApiTestCase;
+
+/**
+ * Class AbstractTestController
+ * @package Tests\SitemapPlugin\Controller
+ */
+abstract class AbstractTestController extends XmlApiTestCase
+{
+    /**
+     * @before
+     */
+    public function setUpClient()
+    {
+        $this->client = static::createClient(array(), array());
+    }
+}
diff --git a/tests/Controller/RelativeClientTrait.php b/tests/Controller/RelativeClientTrait.php
@@ -18,6 +18,6 @@ public static function createSharedKernel()
      */
     public function setUpClient()
     {
-        $this->client = static::createClient(array('environment' => 'test_relative'), array('HTTP_ACCEPT' => 'application/xml'));
+        $this->client = static::createClient(array('environment' => 'test_relative'), []);
     }
 }
diff --git a/tests/Controller/SitemapAllControllerApiRelativeTest.php b/tests/Controller/SitemapAllControllerApiRelativeTest.php
@@ -2,17 +2,16 @@
 
 namespace Tests\SitemapPlugin\Controller;
 
-use Lakion\ApiTestCase\XmlApiTestCase;
 use Sylius\Component\Core\Model\Product;
 use Sylius\Component\Core\Model\Taxon;
 
 /**
  * @author Stefan Doorn <[email protected]>
  */
-class SitemapAllControllerApiRelativeTest extends XmlApiTestCase
+class SitemapAllControllerApiRelativeTest extends AbstractTestController
 {
-   use RelativeClientTrait;
-   use TearDownTrait;
+    use RelativeClientTrait;
+    use TearDownTrait;
 
     /**
      * @before

diff --git a/tests/Controller/SitemapAllControllerApiTest.php b/tests/Controller/SitemapAllControllerApiTest.php
@@ -2,14 +2,13 @@
 
 namespace Tests\SitemapPlugin\Controller;
 
-use Lakion\ApiTestCase\XmlApiTestCase;
 use Sylius\Component\Core\Model\Product;
 use Sylius\Component\Core\Model\Taxon;
 
 /**
  * @author Stefan Doorn <[email protected]>
  */
-class SitemapAllControllerApiTest extends XmlApiTestCase
+class SitemapAllControllerApiTest extends AbstractTestController
 {
     use TearDownTrait;
 

diff --git a/tests/Controller/SitemapIndexControllerApiRelativeTest.php b/tests/Controller/SitemapIndexControllerApiRelativeTest.php
@@ -2,14 +2,13 @@
 
 namespace Tests\SitemapPlugin\Controller;
 
-use Lakion\ApiTestCase\XmlApiTestCase;
 use Sylius\Component\Core\Model\Product;
 use Sylius\Component\Core\Model\Taxon;
 
 /**
  * @author Stefan Doorn <[email protected]>
  */
-class SitemapIndexControllerApiRelativeTest extends XmlApiTestCase
+class SitemapIndexControllerApiRelativeTest extends AbstractTestController
 {
     use RelativeClientTrait;
     use TearDownTrait;

diff --git a/tests/Controller/SitemapIndexControllerApiTest.php b/tests/Controller/SitemapIndexControllerApiTest.php
@@ -2,14 +2,13 @@
 
 namespace Tests\SitemapPlugin\Controller;
 
-use Lakion\ApiTestCase\XmlApiTestCase;
 use Sylius\Component\Core\Model\Product;
 use Sylius\Component\Core\Model\Taxon;
 
 /**
  * @author Stefan Doorn <[email protected]>
  */
-class SitemapIndexControllerApiTest extends XmlApiTestCase
+class SitemapIndexControllerApiTest extends AbstractTestController
 {
     use TearDownTrait;
 

diff --git a/tests/Controller/SitemapProductControllerApiLocalesTest.php b/tests/Controller/SitemapProductControllerApiLocalesTest.php
@@ -2,13 +2,12 @@
 
 namespace Tests\SitemapPlugin\Controller;
 
-use Lakion\ApiTestCase\XmlApiTestCase;
 use Sylius\Component\Core\Model\Product;
 
 /**
  * @author Stefan Doorn <[email protected]>
  */
-class SitemapProductControllerApiLocalesTest extends XmlApiTestCase
+class SitemapProductControllerApiLocalesTest extends AbstractTestController
 {
     use TearDownTrait;
 

diff --git a/tests/Controller/SitemapProductControllerApiRelativeTest.php b/tests/Controller/SitemapProductControllerApiRelativeTest.php
@@ -2,13 +2,12 @@
 
 namespace Tests\SitemapPlugin\Controller;
 
-use Lakion\ApiTestCase\XmlApiTestCase;
 use Sylius\Component\Core\Model\Product;
 
 /**
  * @author Stefan Doorn <[email protected]>
  */
-class SitemapProductControllerApiRelativeTest extends XmlApiTestCase
+class SitemapProductControllerApiRelativeTest extends AbstractTestController
 {
     use RelativeClientTrait;
     use TearDownTrait;

diff --git a/tests/Controller/SitemapProductControllerApiTest.php b/tests/Controller/SitemapProductControllerApiTest.php
@@ -2,13 +2,12 @@
 
 namespace Tests\SitemapPlugin\Controller;
 
-use Lakion\ApiTestCase\XmlApiTestCase;
 use Sylius\Component\Core\Model\Product;
 
 /**
  * @author Stefan Doorn <[email protected]>
  */
-class SitemapProductControllerApiTest extends XmlApiTestCase
+class SitemapProductControllerApiTest extends AbstractTestController
 {
     use TearDownTrait;
 

diff --git a/tests/Controller/SitemapTaxonControllerApiLocalesTest.php b/tests/Controller/SitemapTaxonControllerApiLocalesTest.php
@@ -2,13 +2,12 @@
 
 namespace Tests\SitemapPlugin\Controller;
 
-use Lakion\ApiTestCase\XmlApiTestCase;
 use Sylius\Component\Core\Model\Taxon;
 
 /**
  * @author Stefan Doorn <[email protected]>
  */
-class SitemapTaxonControllerApiLocalesTest extends XmlApiTestCase
+class SitemapTaxonControllerApiLocalesTest extends AbstractTestController
 {
     use TearDownTrait;
 

diff --git a/tests/Controller/SitemapTaxonControllerApiRelativeTest.php b/tests/Controller/SitemapTaxonControllerApiRelativeTest.php
@@ -2,13 +2,12 @@
 
 namespace Tests\SitemapPlugin\Controller;
 
-use Lakion\ApiTestCase\XmlApiTestCase;
 use Sylius\Component\Core\Model\Taxon;
 
 /**
  * @author Stefan Doorn <[email protected]>
  */
-class SitemapTaxonControllerApiRelativeTest extends XmlApiTestCase
+class SitemapTaxonControllerApiRelativeTest extends AbstractTestController
 {
     use RelativeClientTrait;
     use TearDownTrait;

diff --git a/tests/Controller/SitemapTaxonControllerApiTest.php b/tests/Controller/SitemapTaxonControllerApiTest.php
@@ -2,13 +2,12 @@
 
 namespace Tests\SitemapPlugin\Controller;
 
-use Lakion\ApiTestCase\XmlApiTestCase;
 use Sylius\Component\Core\Model\Taxon;
 
 /**
  * @author Stefan Doorn <[email protected]>
  */
-class SitemapTaxonControllerApiTest extends XmlApiTestCase
+class SitemapTaxonControllerApiTest extends AbstractTestController
 {
     use TearDownTrait;