Issue #2831953 by bojanz, garnett2125: Expand CommerceBrowserTestBase for stores

garnett2125 · bojanz · commit c5cb064eff4a · 2017-01-28T12:25:38.000+01:00
diff --git a/modules/checkout/tests/src/Functional/CheckoutOrderTest.php b/modules/checkout/tests/src/Functional/CheckoutOrderTest.php
@@ -3,7 +3,6 @@
 namespace Drupal\Tests\commerce_checkout\Functional;
 
 use Drupal\commerce_price\Price;
-use Drupal\commerce_store\StoreCreationTrait;
 use Drupal\Tests\commerce\Functional\CommerceBrowserTestBase;
 use Drupal\profile\Entity\Profile;
 use Drupal\commerce_order\Entity\OrderItem;
@@ -18,8 +17,6 @@
  */
 class CheckoutOrderTest extends CommerceBrowserTestBase {
 
-  use StoreCreationTrait;
-
   /**
    * The current user.
    *
@@ -34,21 +31,14 @@ class CheckoutOrderTest extends CommerceBrowserTestBase {
    */
   protected $product;
 
-  /**
-   * The store.
-   *
-   * @var \Drupal\commerce_store\Entity\StoreInterface
-   */
-  protected $store;
-
   /**
    * Modules to enable.
    *
    * @var array
    */
   public static $modules = ['system', 'field', 'user', 'text',
     'entity', 'views', 'address', 'profile', 'commerce', 'inline_entity_form',
-    'commerce_price', 'commerce_store', 'commerce_product', 'commerce_cart',
+    'commerce_price', 'commerce_product', 'commerce_cart',
     'commerce_checkout', 'commerce_order', 'views_ui',
     // @see https://www.drupal.org/node/2807567
     'editor',
@@ -72,8 +62,6 @@ protected function setUp() {
 
     $this->placeBlock('commerce_cart');
 
-    $this->store = $this->createStore('Demo', 'demo@example.com', 'default', TRUE);
-
     $variation = $this->createEntity('commerce_product_variation', [
       'type' => 'default',
       'sku' => strtolower($this->randomMachineName()),
diff --git a/modules/order/tests/src/Functional/OrderAdminTest.php b/modules/order/tests/src/Functional/OrderAdminTest.php
@@ -158,7 +158,6 @@ public function testDeleteOrder() {
    * Tests that an admin can view an order's details.
    */
   public function testAdminOrderView() {
-    $customer = $this->createUser();
     $order_item = $this->createEntity('commerce_order_item', [
       'type' => 'default',
       'unit_price' => [
@@ -169,12 +168,10 @@ public function testAdminOrderView() {
     $order = $this->createEntity('commerce_order', [
       'type' => 'default',
       'store_id' => $this->store->id(),
-      'uid' => $customer,
       'mail' => $this->loggedInUser->getEmail(),
       'order_items' => [$order_item],
       'state' => 'draft',
       'uid' => $this->loggedInUser,
-      'store_id' => $this->store,
     ]);
 
     // First test that the current admin user can see the order.
diff --git a/modules/order/tests/src/Functional/OrderBrowserTestBase.php b/modules/order/tests/src/Functional/OrderBrowserTestBase.php
@@ -2,30 +2,20 @@
 
 namespace Drupal\Tests\commerce_order\Functional;
 
-use Drupal\commerce_store\StoreCreationTrait;
 use Drupal\Tests\commerce\Functional\CommerceBrowserTestBase;
 
 /**
  * Defines base class for commerce_order test cases.
  */
 abstract class OrderBrowserTestBase extends CommerceBrowserTestBase {
 
-  use StoreCreationTrait;
-
   /**
    * The variation to test against.
    *
    * @var \Drupal\commerce_product\Entity\ProductVariation
    */
   protected $variation;
 
-  /**
-   * The store to test against.
-   *
-   * @var \Drupal\commerce_store\Entity\Store
-   */
-  protected $store;
-
   /**
    * Modules to enable.
    *
@@ -55,9 +45,6 @@ protected function getAdministratorPermissions() {
   protected function setUp() {
     parent::setUp();
 
-    // Create a store.
-    $this->store = $this->createStore();
-
     // Create a product variation.
     $this->variation = $this->createEntity('commerce_product_variation', [
       'type' => 'default',
diff --git a/modules/order/tests/src/Functional/OrderNoStoreTest.php b/modules/order/tests/src/Functional/OrderNoStoreTest.php
@@ -34,6 +34,7 @@ protected function getAdministratorPermissions() {
    * Tests creating an order.
    */
   public function testCreateOrder() {
+    $this->store->delete();
     $this->drupalGet('admin/commerce/orders');
     $this->clickLink('Create a new order');
 
diff --git a/modules/order/tests/src/FunctionalJavascript/OrderReassignTest.php b/modules/order/tests/src/FunctionalJavascript/OrderReassignTest.php
@@ -3,7 +3,6 @@
 namespace Drupal\Tests\commerce_order\FunctionalJavascript;
 
 use Drupal\commerce_order\Entity\Order;
-use Drupal\commerce_store\StoreCreationTrait;
 use Drupal\Tests\commerce\Functional\CommerceBrowserTestBase;
 use Drupal\Tests\commerce\FunctionalJavascript\JavascriptTestTrait;
 
@@ -14,16 +13,8 @@
  */
 class OrderReassignTest extends CommerceBrowserTestBase {
 
-  use StoreCreationTrait;
   use JavascriptTestTrait;
 
-  /**
-   * The store entity.
-   *
-   * @var \Drupal\commerce_store\Entity\Store
-   */
-  protected $store;
-
   /**
    * Modules to enable.
    *
@@ -50,7 +41,6 @@ protected function getAdministratorPermissions() {
    */
   protected function setUp() {
     parent::setUp();
-    $this->store = $this->createStore();
   }
 
   /**
diff --git a/modules/payment/tests/src/Functional/PaymentAdminTest.php b/modules/payment/tests/src/Functional/PaymentAdminTest.php
@@ -4,7 +4,6 @@
 
 use Drupal\commerce_payment\Entity\Payment;
 use Drupal\commerce_price\Price;
-use Drupal\commerce_store\StoreCreationTrait;
 use Drupal\Tests\commerce\Functional\CommerceBrowserTestBase;
 
 /**
@@ -14,8 +13,6 @@
  */
 class PaymentAdminTest extends CommerceBrowserTestBase {
 
-  use StoreCreationTrait;
-
   /**
    * An on-site payment gateway.
    *
@@ -44,13 +41,6 @@ class PaymentAdminTest extends CommerceBrowserTestBase {
    */
   protected $order;
 
-  /**
-   * The store entity.
-   *
-   * @var \Drupal\commerce_store\Entity\Store
-   */
-  protected $store;
-
   /**
    * {@inheritdoc}
    */
@@ -78,8 +68,6 @@ protected function getAdministratorPermissions() {
   protected function setUp() {
     parent::setUp();
 
-    $this->store = $this->createStore();
-
     $this->paymentGateway = $this->createEntity('commerce_payment_gateway', [
       'id' => 'example',
       'label' => 'Example',
diff --git a/modules/payment/tests/src/Functional/PaymentCheckoutOffsiteRedirectTest.php b/modules/payment/tests/src/Functional/PaymentCheckoutOffsiteRedirectTest.php
@@ -5,7 +5,6 @@
 use Drupal\commerce_order\Entity\Order;
 use Drupal\commerce_payment\Entity\Payment;
 use Drupal\commerce_payment\Entity\PaymentGateway;
-use Drupal\commerce_store\StoreCreationTrait;
 use Drupal\Core\Entity\Entity\EntityFormDisplay;
 use Drupal\Tests\commerce\Functional\CommerceBrowserTestBase;
 
@@ -16,8 +15,6 @@
  */
 class PaymentCheckoutOffsiteRedirectTest extends CommerceBrowserTestBase {
 
-  use StoreCreationTrait;
-
   /**
    * The current user.
    *
@@ -51,8 +48,6 @@ class PaymentCheckoutOffsiteRedirectTest extends CommerceBrowserTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $store = $this->createStore('Demo', 'demo@example.com', 'default', TRUE);
-
     $variation = $this->createEntity('commerce_product_variation', [
       'type' => 'default',
       'sku' => strtolower($this->randomMachineName()),
@@ -67,7 +62,7 @@ protected function setUp() {
       'type' => 'default',
       'title' => 'My product',
       'variations' => [$variation],
-      'stores' => [$store],
+      'stores' => [$this->store],
     ]);
 
     /** @var \Drupal\commerce_payment\Entity\PaymentGateway $gateway */
diff --git a/modules/payment/tests/src/Functional/PaymentCheckoutTest.php b/modules/payment/tests/src/Functional/PaymentCheckoutTest.php
@@ -6,7 +6,6 @@
 use Drupal\commerce_order\Entity\Order;
 use Drupal\commerce_payment\Entity\Payment;
 use Drupal\commerce_payment\Entity\PaymentGateway;
-use Drupal\commerce_store\StoreCreationTrait;
 use Drupal\Core\Entity\Entity\EntityFormDisplay;
 use Drupal\Tests\commerce\Functional\CommerceBrowserTestBase;
 
@@ -17,8 +16,6 @@
  */
 class PaymentCheckoutTest extends CommerceBrowserTestBase {
 
-  use StoreCreationTrait;
-
   /**
    * The current user.
    *
@@ -52,8 +49,6 @@ class PaymentCheckoutTest extends CommerceBrowserTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $store = $this->createStore('Demo', 'demo@example.com', 'default', TRUE);
-
     $variation = $this->createEntity('commerce_product_variation', [
       'type' => 'default',
       'sku' => strtolower($this->randomMachineName()),
@@ -68,7 +63,7 @@ protected function setUp() {
       'type' => 'default',
       'title' => 'My product',
       'variations' => [$variation],
-      'stores' => [$store],
+      'stores' => [$this->store],
     ]);
 
     /** @var \Drupal\commerce_payment\Entity\PaymentGateway $gateway */
diff --git a/modules/product/tests/src/Functional/ProductBrowserTestBase.php b/modules/product/tests/src/Functional/ProductBrowserTestBase.php
@@ -3,7 +3,6 @@
 namespace Drupal\Tests\commerce_product\Functional;
 
 use Drupal\field\Tests\EntityReference\EntityReferenceTestTrait;
-use Drupal\commerce_store\StoreCreationTrait;
 use Drupal\Tests\commerce\Functional\CommerceBrowserTestBase;
 
 /**
@@ -12,15 +11,13 @@
 abstract class ProductBrowserTestBase extends CommerceBrowserTestBase {
 
   use EntityReferenceTestTrait;
-  use StoreCreationTrait;
 
   /**
    * Modules to enable.
    *
    * @var array
    */
   public static $modules = [
-    'commerce_store',
     'commerce_product',
     'commerce_order',
     'field_ui',
@@ -62,8 +59,8 @@ protected function getAdministratorPermissions() {
   protected function setUp() {
     parent::setUp();
 
-    $this->stores = [];
-    for ($i = 0; $i < 3; $i++) {
+    $this->stores = [$this->store];
+    for ($i = 0; $i < 2; $i++) {
       $this->stores[] = $this->createStore();
     }
   }
diff --git a/modules/product/tests/src/Functional/ProductNoStoreTest.php b/modules/product/tests/src/Functional/ProductNoStoreTest.php
@@ -16,7 +16,6 @@ class ProductNoStoreTest extends CommerceBrowserTestBase {
    * {@inheritdoc}
    */
   public static $modules = [
-    'commerce_store',
     'commerce_product',
   ];
 
@@ -35,6 +34,7 @@ protected function getAdministratorPermissions() {
    * Tests creating a product.
    */
   public function testCreateProduct() {
+    $this->store->delete();
     $this->drupalGet('admin/commerce/products');
     $this->clickLink('Add product');
 
diff --git a/modules/promotion/tests/src/FunctionalJavascript/PromotionTest.php b/modules/promotion/tests/src/FunctionalJavascript/PromotionTest.php
@@ -3,7 +3,6 @@
 namespace Drupal\Tests\commerce_promotion\FunctionalJavascript;
 
 use Drupal\commerce_promotion\Entity\Promotion;
-use Drupal\commerce_store\StoreCreationTrait;
 use Drupal\Tests\commerce\Functional\CommerceBrowserTestBase;
 use Drupal\Tests\commerce\FunctionalJavascript\JavascriptTestTrait;
 
@@ -14,7 +13,6 @@
  */
 class PromotionTest extends CommerceBrowserTestBase {
 
-  use StoreCreationTrait;
   use JavascriptTestTrait;
 
   /**
@@ -39,8 +37,6 @@ protected function getAdministratorPermissions() {
    * @group create
    */
   public function testCreatePromotion() {
-    $this->createStore(NULL, NULL, 'default', TRUE);
-
     $this->drupalGet('admin/commerce/promotions');
     $this->getSession()->getPage()->clickLink('Add a new promotion');
     $this->drupalGet('promotion/add');
@@ -76,8 +72,6 @@ public function testCreatePromotion() {
    * Tests editing a promotion.
    */
   public function testEditPromotion() {
-    $this->createStore(NULL, NULL, 'default', TRUE);
-
     $promotion = $this->createEntity('commerce_promotion', [
       'name' => $this->randomMachineName(8),
       'status' => TRUE,
diff --git a/modules/store/tests/src/Functional/StoreTypeTest.php b/modules/store/tests/src/Functional/StoreTypeTest.php
@@ -3,8 +3,6 @@
 namespace Drupal\Tests\commerce_store\Functional;
 
 use Drupal\commerce_store\Entity\StoreType;
-use Drupal\commerce_store\StoreCreationTrait;
-use Drupal\simpletest\BlockCreationTrait;
 use Drupal\Tests\commerce\Functional\CommerceBrowserTestBase;
 
 /**
@@ -14,36 +12,6 @@
  */
 class StoreTypeTest extends CommerceBrowserTestBase {
 
-  use BlockCreationTrait;
-  use StoreCreationTrait;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['block', 'commerce_store'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->placeBlock('local_tasks_block');
-    $this->placeBlock('page_title_block');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getAdministratorPermissions() {
-    return array_merge([
-      'administer commerce_store_type',
-      'administer commerce_store',
-    ], parent::getAdministratorPermissions());
-  }
-
   /**
    * Tests if the default Store Type was created.
    */
diff --git a/modules/store/tests/src/FunctionalJavascript/StoreTest.php b/modules/store/tests/src/FunctionalJavascript/StoreTest.php
diff --git a/tests/src/Functional/CommerceBrowserTestBase.php b/tests/src/Functional/CommerceBrowserTestBase.php
diff --git a/tests/src/Functional/EntitySelectWidgetTest.php b/tests/src/Functional/EntitySelectWidgetTest.php
diff --git a/tests/src/Functional/EntityTraitTest.php b/tests/src/Functional/EntityTraitTest.php
diff --git a/tests/src/FunctionalJavascript/PluginItemTest.php b/tests/src/FunctionalJavascript/PluginItemTest.php
