From 0dd9b70d1a9c5c4d11dbb00dbe2656deb4468912 Mon Sep 17 00:00:00 2001 From: Mark Guinn Date: Tue, 23 Feb 2016 23:05:26 +0000 Subject: [PATCH] Fixed test fixture paths again --- tests/ViewableCartTest.php | 2 +- tests/account/AccountPageTest.php | 4 ++-- tests/account/OrderActionsFormTest.php | 4 ++-- tests/cart/ShoppingCartControllerTest.php | 4 ++-- tests/cart/ShoppingCartTest.php | 4 ++-- tests/checkout/AddressBookCheckoutComponentTest.php | 4 ++-- tests/checkout/CheckoutComponentTest.php | 8 ++++---- tests/checkout/CheckoutFormTest.php | 2 +- tests/checkout/CheckoutPageTest.php | 4 ++-- tests/checkout/CheckoutTest.php | 8 ++++---- tests/checkout/NestedCheckoutTest.php | 4 ++-- tests/checkout/OrderProcessorTest.php | 2 +- tests/checkout/SteppedCheckoutTest.php | 4 ++-- tests/cms/ProductBulkLoaderTest.php | 2 +- tests/model/OrderNotificationTest.php | 2 +- tests/model/OrderTest.php | 2 +- tests/model/RegionRestrictionTest.php | 4 ++-- tests/model/ShopMemberTest.php | 4 ++-- tests/model/ShopPaymentTest.php | 4 ++-- tests/model/ZoneTest.php | 4 ++-- tests/modifiers/FlatTaxModifierTest.php | 2 +- tests/modifiers/OrderModifierTest.php | 2 +- tests/products/ProductCategoryTest.php | 2 +- tests/products/ProductImageTest.php | 2 +- tests/products/ProductOrderItemTest.php | 2 +- tests/products/ProductTest.php | 2 +- tests/products/variations/ProductVariationTest.php | 2 +- tests/products/variations/ProductVariationVersionTest.php | 2 +- tests/reports/ShopReportTest.php | 2 +- 29 files changed, 47 insertions(+), 47 deletions(-) diff --git a/tests/ViewableCartTest.php b/tests/ViewableCartTest.php index e856a6af0..b01d090fc 100644 --- a/tests/ViewableCartTest.php +++ b/tests/ViewableCartTest.php @@ -2,7 +2,7 @@ class ViewableCartTest extends SapphireTest { - public static $fixture_file = SHOP_DIR . '/tests/fixtures/shop.yml'; + public static $fixture_file = 'silvershop/tests/fixtures/shop.yml'; public static $disable_theme = true; function setUp() diff --git a/tests/account/AccountPageTest.php b/tests/account/AccountPageTest.php index 1437cf45b..ee0868776 100644 --- a/tests/account/AccountPageTest.php +++ b/tests/account/AccountPageTest.php @@ -3,8 +3,8 @@ class AccountPageTest extends FunctionalTest { protected static $fixture_file = array( - SHOP_DIR . '/tests/fixtures/Pages.yml', - SHOP_DIR . '/tests/fixtures/shop.yml', + 'silvershop/tests/fixtures/Pages.yml', + 'silvershop/tests/fixtures/shop.yml', ); protected static $disable_theme = true; protected static $use_draft_site = true; diff --git a/tests/account/OrderActionsFormTest.php b/tests/account/OrderActionsFormTest.php index ba60b6045..8c15f81c7 100644 --- a/tests/account/OrderActionsFormTest.php +++ b/tests/account/OrderActionsFormTest.php @@ -3,8 +3,8 @@ class OrderActionsFormTest extends FunctionalTest { protected static $fixture_file = array( - SHOP_DIR . '/tests/fixtures/Pages.yml', - SHOP_DIR . '/tests/fixtures/shop.yml', + 'silvershop/tests/fixtures/Pages.yml', + 'silvershop/tests/fixtures/shop.yml', ); public function setUp() diff --git a/tests/cart/ShoppingCartControllerTest.php b/tests/cart/ShoppingCartControllerTest.php index 7ed9bdf49..66976816d 100644 --- a/tests/cart/ShoppingCartControllerTest.php +++ b/tests/cart/ShoppingCartControllerTest.php @@ -7,7 +7,7 @@ */ class ShoppingCartControllerTest extends FunctionalTest { - public static $fixture_file = SHOP_DIR . '/tests/fixtures/shop.yml'; + public static $fixture_file = 'silvershop/tests/fixtures/shop.yml'; public static $disable_theme = true; public static $use_draft_site = false; @@ -138,7 +138,7 @@ public function testRemoveFromCart() public function testVariations() { - $this->loadFixture(SHOP_DIR . '/tests/fixtures/variations.yml'); + $this->loadFixture('silvershop/tests/fixtures/variations.yml'); $ballRoot = $this->objFromFixture('Product', 'ball'); $ballRoot->publish('Stage', 'Live'); $ball1 = $this->objFromFixture('ProductVariation', 'redlarge'); diff --git a/tests/cart/ShoppingCartTest.php b/tests/cart/ShoppingCartTest.php index 96d33d0c4..220e2d731 100644 --- a/tests/cart/ShoppingCartTest.php +++ b/tests/cart/ShoppingCartTest.php @@ -2,7 +2,7 @@ class ShoppingCartTest extends SapphireTest { - public static $fixture_file = SHOP_DIR . '/tests/fixtures/shop.yml'; + public static $fixture_file = 'silvershop/tests/fixtures/shop.yml'; public static $disable_theme = true; public static $use_draft_site = false; @@ -51,7 +51,7 @@ public function testClear() public function testProductVariations() { - $this->loadFixture(SHOP_DIR . '/tests/fixtures/variations.yml'); + $this->loadFixture('silvershop/tests/fixtures/variations.yml'); $ball1 = $this->objFromFixture('ProductVariation', 'redlarge'); $ball2 = $this->objFromFixture('ProductVariation', 'redsmall'); diff --git a/tests/checkout/AddressBookCheckoutComponentTest.php b/tests/checkout/AddressBookCheckoutComponentTest.php index 3fb61d34a..6dacddce3 100644 --- a/tests/checkout/AddressBookCheckoutComponentTest.php +++ b/tests/checkout/AddressBookCheckoutComponentTest.php @@ -3,8 +3,8 @@ class AddressBookCheckoutComponentTest extends SapphireTest { protected static $fixture_file = array( - SHOP_DIR . '/tests/fixtures/Orders.yml', - SHOP_DIR . '/tests/fixtures/ShopMembers.yml', + 'silvershop/tests/fixtures/Orders.yml', + 'silvershop/tests/fixtures/ShopMembers.yml', ); /** @var Order $cart */ protected $cart; diff --git a/tests/checkout/CheckoutComponentTest.php b/tests/checkout/CheckoutComponentTest.php index cb5cf1a33..6252f1cae 100644 --- a/tests/checkout/CheckoutComponentTest.php +++ b/tests/checkout/CheckoutComponentTest.php @@ -3,10 +3,10 @@ class CheckoutComponentTest extends SapphireTest { protected static $fixture_file = array( - SHOP_DIR . '/tests/fixtures/Orders.yml', - SHOP_DIR . '/tests/fixtures/Addresses.yml', - SHOP_DIR . '/tests/fixtures/shop.yml', - SHOP_DIR . '/tests/fixtures/ShopMembers.yml', + 'silvershop/tests/fixtures/Orders.yml', + 'silvershop/tests/fixtures/Addresses.yml', + 'silvershop/tests/fixtures/shop.yml', + 'silvershop/tests/fixtures/ShopMembers.yml', ); public function setUp() diff --git a/tests/checkout/CheckoutFormTest.php b/tests/checkout/CheckoutFormTest.php index 7664441c4..d933390d6 100644 --- a/tests/checkout/CheckoutFormTest.php +++ b/tests/checkout/CheckoutFormTest.php @@ -2,7 +2,7 @@ class CheckoutFormTest extends SapphireTest { - public static $fixture_file = SHOP_DIR . '/tests/fixtures/shop.yml'; + public static $fixture_file = 'silvershop/tests/fixtures/shop.yml'; public function setUp() { diff --git a/tests/checkout/CheckoutPageTest.php b/tests/checkout/CheckoutPageTest.php index a2244954d..a9ebe0c09 100644 --- a/tests/checkout/CheckoutPageTest.php +++ b/tests/checkout/CheckoutPageTest.php @@ -3,8 +3,8 @@ class CheckoutPageTest extends FunctionalTest { protected static $fixture_file = array( - SHOP_DIR . '/tests/fixtures/Pages.yml', - SHOP_DIR . '/tests/fixtures/shop.yml', + 'silvershop/tests/fixtures/Pages.yml', + 'silvershop/tests/fixtures/shop.yml', ); protected static $disable_theme = true; protected static $use_draft_site = true; diff --git a/tests/checkout/CheckoutTest.php b/tests/checkout/CheckoutTest.php index dce91cae0..d13389d5a 100644 --- a/tests/checkout/CheckoutTest.php +++ b/tests/checkout/CheckoutTest.php @@ -3,10 +3,10 @@ class CheckoutTest extends SapphireTest { protected static $fixture_file = array( - SHOP_DIR . '/tests/fixtures/Pages.yml', - SHOP_DIR . '/tests/fixtures/Orders.yml', - SHOP_DIR . '/tests/fixtures/Addresses.yml', - SHOP_DIR . '/tests/fixtures/ShopMembers.yml', + 'silvershop/tests/fixtures/Pages.yml', + 'silvershop/tests/fixtures/Orders.yml', + 'silvershop/tests/fixtures/Addresses.yml', + 'silvershop/tests/fixtures/ShopMembers.yml', ); public function setUp() diff --git a/tests/checkout/NestedCheckoutTest.php b/tests/checkout/NestedCheckoutTest.php index 753a7122a..665cf98ad 100644 --- a/tests/checkout/NestedCheckoutTest.php +++ b/tests/checkout/NestedCheckoutTest.php @@ -2,7 +2,7 @@ class NestedCheckoutTest extends SapphireTest { - public static $fixture_file = SHOP_DIR . '/tests/fixtures/pages/NestedCheckout.yml'; + public static $fixture_file = 'silvershop/tests/fixtures/pages/NestedCheckout.yml'; public function setUp() { @@ -14,7 +14,7 @@ public function testNestedCheckoutForm() { $this->assertEquals( - Director::baseURL() . SHOP_DIR . '/checkout/', + Director::baseURL() . 'silvershop/checkout/', CheckoutPage::find_link(), 'Link is: ' . CheckoutPage::find_link() ); diff --git a/tests/checkout/OrderProcessorTest.php b/tests/checkout/OrderProcessorTest.php index 43099f292..f2b291bdb 100644 --- a/tests/checkout/OrderProcessorTest.php +++ b/tests/checkout/OrderProcessorTest.php @@ -8,7 +8,7 @@ */ class OrderProcessorTest extends SapphireTest { - protected static $fixture_file = SHOP_DIR . '/tests/fixtures/shop.yml'; + protected static $fixture_file = 'silvershop/tests/fixtures/shop.yml'; protected static $disable_theme = true; protected static $use_draft_site = true; protected $processor; diff --git a/tests/checkout/SteppedCheckoutTest.php b/tests/checkout/SteppedCheckoutTest.php index 34ce84070..5ca87773e 100644 --- a/tests/checkout/SteppedCheckoutTest.php +++ b/tests/checkout/SteppedCheckoutTest.php @@ -3,8 +3,8 @@ class SteppedCheckoutTest extends FunctionalTest { protected static $fixture_file = array( - SHOP_DIR . '/tests/fixtures/Pages.yml', - SHOP_DIR . '/tests/fixtures/shop.yml', + 'silvershop/tests/fixtures/Pages.yml', + 'silvershop/tests/fixtures/shop.yml', ); protected static $use_draft_site = true; //so we don't need to publish protected $autoFollowRedirection = false; diff --git a/tests/cms/ProductBulkLoaderTest.php b/tests/cms/ProductBulkLoaderTest.php index c21eb001f..fcda0e6da 100644 --- a/tests/cms/ProductBulkLoaderTest.php +++ b/tests/cms/ProductBulkLoaderTest.php @@ -2,7 +2,7 @@ class ProductBulkLoaderTest extends FunctionalTest { - public static $fixture_file = SHOP_DIR . '/tests/fixtures/shop.yml'; + public static $fixture_file = 'silvershop/tests/fixtures/shop.yml'; public static $disable_theme = true; public static $use_draft_site = true; diff --git a/tests/model/OrderNotificationTest.php b/tests/model/OrderNotificationTest.php index 8b6740d8d..55e171033 100644 --- a/tests/model/OrderNotificationTest.php +++ b/tests/model/OrderNotificationTest.php @@ -7,7 +7,7 @@ */ class OrderNotificationTest extends SapphireTest { - protected static $fixture_file = SHOP_DIR . '/tests/fixtures/shop.yml'; + protected static $fixture_file = 'silvershop/tests/fixtures/shop.yml'; /** @var Order */ protected $order; /** @var OrderEmailNotifier */ diff --git a/tests/model/OrderTest.php b/tests/model/OrderTest.php index 8b1845cf0..c4ad52e90 100644 --- a/tests/model/OrderTest.php +++ b/tests/model/OrderTest.php @@ -9,7 +9,7 @@ */ class OrderTest extends SapphireTest { - public static $fixture_file = SHOP_DIR . '/tests/fixtures/shop.yml'; + public static $fixture_file = 'silvershop/tests/fixtures/shop.yml'; public function setUp() { diff --git a/tests/model/RegionRestrictionTest.php b/tests/model/RegionRestrictionTest.php index 46c39ceec..ea25fd2c9 100644 --- a/tests/model/RegionRestrictionTest.php +++ b/tests/model/RegionRestrictionTest.php @@ -3,8 +3,8 @@ class RegionRestrictionTest extends SapphireTest { public static $fixture_file = array( - SHOP_DIR . '/tests/fixtures/RegionRestriction.yml', - SHOP_DIR . '/tests/fixtures/Addresses.yml', + 'silvershop/tests/fixtures/RegionRestriction.yml', + 'silvershop/tests/fixtures/Addresses.yml', ); public function testMatchLocal() diff --git a/tests/model/ShopMemberTest.php b/tests/model/ShopMemberTest.php index e37b618db..317c89be1 100644 --- a/tests/model/ShopMemberTest.php +++ b/tests/model/ShopMemberTest.php @@ -6,8 +6,8 @@ class ShopMemberTest extends FunctionalTest { public static $fixture_file = array( - SHOP_DIR . '/tests/fixtures/ShopMembers.yml', - SHOP_DIR . '/tests/fixtures/shop.yml', + 'silvershop/tests/fixtures/ShopMembers.yml', + 'silvershop/tests/fixtures/shop.yml', ); public function testGetByIdentifier() diff --git a/tests/model/ShopPaymentTest.php b/tests/model/ShopPaymentTest.php index 0e1fe3df2..65e72784f 100644 --- a/tests/model/ShopPaymentTest.php +++ b/tests/model/ShopPaymentTest.php @@ -3,8 +3,8 @@ class ShopPaymentTest extends FunctionalTest { protected static $fixture_file = array( - SHOP_DIR . '/tests/fixtures/Pages.yml', - SHOP_DIR . '/tests/fixtures/shop.yml', + 'silvershop/tests/fixtures/Pages.yml', + 'silvershop/tests/fixtures/shop.yml', ); public static $disable_theme = true; diff --git a/tests/model/ZoneTest.php b/tests/model/ZoneTest.php index 3a97245bc..2a24a236d 100644 --- a/tests/model/ZoneTest.php +++ b/tests/model/ZoneTest.php @@ -3,8 +3,8 @@ class ZoneTest extends SapphireTest { public static $fixture_file = array( - SHOP_DIR . '/tests/fixtures/Zones.yml', - SHOP_DIR . '/tests/fixtures/Addresses.yml', + 'silvershop/tests/fixtures/Zones.yml', + 'silvershop/tests/fixtures/Addresses.yml', ); public function testMatchingZones() diff --git a/tests/modifiers/FlatTaxModifierTest.php b/tests/modifiers/FlatTaxModifierTest.php index 8cef9ef32..52827fc0c 100644 --- a/tests/modifiers/FlatTaxModifierTest.php +++ b/tests/modifiers/FlatTaxModifierTest.php @@ -7,7 +7,7 @@ */ class FlatTaxModifierTest extends FunctionalTest { - protected static $fixture_file = SHOP_DIR . '/tests/fixtures/shop.yml'; + protected static $fixture_file = 'silvershop/tests/fixtures/shop.yml'; protected static $disable_theme = true; public function setUp() diff --git a/tests/modifiers/OrderModifierTest.php b/tests/modifiers/OrderModifierTest.php index 6e107baf3..a90461a3d 100644 --- a/tests/modifiers/OrderModifierTest.php +++ b/tests/modifiers/OrderModifierTest.php @@ -6,7 +6,7 @@ */ class OrderModifierTest extends FunctionalTest { - public static $fixture_file = SHOP_DIR . '/tests/fixtures/shop.yml'; + public static $fixture_file = 'silvershop/tests/fixtures/shop.yml'; public static $disable_theme = true; public static $use_draft_site = true; diff --git a/tests/products/ProductCategoryTest.php b/tests/products/ProductCategoryTest.php index 5c98a3995..f8a69a429 100644 --- a/tests/products/ProductCategoryTest.php +++ b/tests/products/ProductCategoryTest.php @@ -2,7 +2,7 @@ class ProductCategoryTest extends FunctionalTest { - public static $fixture_file = SHOP_DIR . '/tests/fixtures/shop.yml'; + public static $fixture_file = 'silvershop/tests/fixtures/shop.yml'; public static $disable_theme = true; public function setUp() diff --git a/tests/products/ProductImageTest.php b/tests/products/ProductImageTest.php index 371971823..fce7cc1bc 100644 --- a/tests/products/ProductImageTest.php +++ b/tests/products/ProductImageTest.php @@ -11,7 +11,7 @@ */ class ProductImageTest extends SapphireTest { - protected static $fixture_file = SHOP_DIR . '/tests/fixtures/shop.yml'; + protected static $fixture_file = 'silvershop/tests/fixtures/shop.yml'; /** * Set to true in {@link self::setUp()} if we created the assets folder, so we know to remove it in * {@link self::tearDown()}. diff --git a/tests/products/ProductOrderItemTest.php b/tests/products/ProductOrderItemTest.php index 33e4832c2..de2a55e5f 100644 --- a/tests/products/ProductOrderItemTest.php +++ b/tests/products/ProductOrderItemTest.php @@ -6,7 +6,7 @@ */ class ProductOrderItemTest extends FunctionalTest { - public static $fixture_file = SHOP_DIR . '/tests/fixtures/shop.yml'; + public static $fixture_file = 'silvershop/tests/fixtures/shop.yml'; public static $disable_theme = true; public static $orig = array(); diff --git a/tests/products/ProductTest.php b/tests/products/ProductTest.php index 120dce748..539d89276 100644 --- a/tests/products/ProductTest.php +++ b/tests/products/ProductTest.php @@ -7,7 +7,7 @@ */ class ProductTest extends FunctionalTest { - protected static $fixture_file = SHOP_DIR . '/tests/fixtures/shop.yml'; + protected static $fixture_file = 'silvershop/tests/fixtures/shop.yml'; protected static $disable_theme = true; protected static $use_draft_site = true; diff --git a/tests/products/variations/ProductVariationTest.php b/tests/products/variations/ProductVariationTest.php index 9c1e3a795..f7c10a5a0 100644 --- a/tests/products/variations/ProductVariationTest.php +++ b/tests/products/variations/ProductVariationTest.php @@ -10,7 +10,7 @@ */ class ProductVariationTest extends SapphireTest { - public static $fixture_file = SHOP_DIR . '/tests/fixtures/variations.yml'; + public static $fixture_file = 'silvershop/tests/fixtures/variations.yml'; public static $disable_theme = true; public static $use_draft_site = true; diff --git a/tests/products/variations/ProductVariationVersionTest.php b/tests/products/variations/ProductVariationVersionTest.php index deef4efc7..e6475ab88 100644 --- a/tests/products/variations/ProductVariationVersionTest.php +++ b/tests/products/variations/ProductVariationVersionTest.php @@ -10,7 +10,7 @@ */ class ProductVariationVersionTest extends SapphireTest { - public static $fixture_file = SHOP_DIR . '/tests/fixtures/variations.yml'; + public static $fixture_file = 'silvershop/tests/fixtures/variations.yml'; public static $disable_theme = true; public static $use_draft_site = true; diff --git a/tests/reports/ShopReportTest.php b/tests/reports/ShopReportTest.php index 991f0c6de..b90d5b976 100644 --- a/tests/reports/ShopReportTest.php +++ b/tests/reports/ShopReportTest.php @@ -2,7 +2,7 @@ class ShopReportTest extends SapphireTest { - protected static $fixture_file = SHOP_DIR . '/tests/fixtures/shop.yml'; + protected static $fixture_file = 'silvershop/tests/fixtures/shop.yml'; function testSalesReport() {