Test and lint fixes

silvershop · Feb 22, 2019 · ea0a5ee · ea0a5ee
1 parent 3ef2e27
commit ea0a5ee
Show file tree

Hide file tree

Showing 17 changed files with 91 additions and 69 deletions.
diff --git a/src/Extensions/Constraints/ProductsDiscountConstraint.php b/src/Extensions/Constraints/ProductsDiscountConstraint.php
@@ -53,7 +53,7 @@ public function check(Discount $discount)
 
         if (!$products->exists()) {
             Versioned::withVersionedMode(
-                function () use ($discount, $productIds) {
+                function () use ($discount, &$productIds) {
                     Versioned::set_stage(Versioned::DRAFT);
 
                     $products = $discount->Products();
@@ -67,7 +67,7 @@ function () use ($discount, $productIds) {
             $productIds = $products->map('ID', 'ID')->toArray();
         }
 
-        if (!productIds) {
+        if (!$productIds) {
             return true;
         }
 

diff --git a/...sions/ProductSpecificPricingExtension.php → src/Extensions/SpecificPricingExtension.php b/...sions/ProductSpecificPricingExtension.php → src/Extensions/SpecificPricingExtension.php
diff --git a/src/Model/OrderCoupon.php b/src/Model/OrderCoupon.php
@@ -5,6 +5,7 @@
 use SilverStripe\Core\Injector\Injector;
 use SilverStripe\Forms\TextField;
 use SilverStripe\Security\RandomGenerator;
+use SilverStripe\ORM\ValidationResult;
 
 /**
  * Applies a discount to current order, if applicable, when entered at checkout.
@@ -94,13 +95,15 @@ public function validate()
         $result = parent::validate();
         $minLength = $this->config()->minimum_code_length;
         $code = $this->getField('Code');
+
         if ($minLength && $code && $this->isChanged('Code') && strlen($code) < $minLength) {
-            $result->error(
+            $result->addError(
                 _t(
                     'OrderCoupon.INVALIDMINLENGTH',
                     'Coupon code must be at least {length} characters in length',
                     ['length' => $this->config()->minimum_code_length]
                 ),
+                ValidationResult::TYPE_ERROR,
                 'INVALIDMINLENGTH'
             );
         }

diff --git a/src/Model/PartialUseDiscount.php b/src/Model/PartialUseDiscount.php
@@ -29,23 +29,20 @@ class PartialUseDiscount extends Discount
 
     public function getCMSFields($params = null)
     {
-        $fields = parent::getCMSFields(
-            [
+        $fields = parent::getCMSFields([
             'forcetype' => 'Amount'
-            ]
-        );
+        ]);
 
-        $fields->removeByName(
-            [
+        $fields->removeByName([
             "ForCart",
             "ForItems",
             "ForShipping",
             "For"
-            ]
-        );
-        $limitfield = $fields->fieldByName("Root.Main.Constraints")
-            ->fieldByName("Main.UseLimit");
-        $fields->replaceField("UseLimit", $limitfield->performReadOnlyTransformation());
+        ]);
+
+        $limitfield = $fields->dataFieldByName('UseLimit');
+
+        $fields->replaceField("UseLimit", $limitfield->performReadonlyTransformation());
         return $fields;
     }
 
@@ -66,13 +63,16 @@ public function createRemainder($used)
         $amount = $this->getAmount();
 
         if ($used < $amount) {
-            //duplicate dataobject and update accordingly
+            // duplicate dataobject and update accordingly
             $remainder = $this->duplicate(false);
             $remainder->write();
-            //delete any relationships that might be sitting in DB for whatever reason
+
+            // delete any relationships that might be sitting in DB for whatever
+            // reason
             $remainder->deleteRelationships();
-            //create proper new relationships
-            $this->duplicateManyManyRelations($this, $remainder);
+
+            // create proper new relationships
+            $this->duplicateManyManyRelations($this, $remainder, true);
 
             //TODO: there may be some relationships that shouldn't be copied?
             $remainder->Amount = $amount - $used;
@@ -103,8 +103,8 @@ public function validate()
      */
     protected function deleteRelationships()
     {
-        if ($this->many_many()) {
-            foreach ($this->many_many() as $name => $type) {
+        if ($this->manyMany()) {
+            foreach ($this->manyMany() as $name => $type) {
                 $this->{$name}()->removeAll();
             }
         }

diff --git a/templates/email/GiftVoucherEmail.ss b/templates/email/GiftVoucherEmail.ss
@@ -1,16 +1,16 @@
 <p>Here is your gift voucher</p>
 
-<% with Coupon %>
+<% with $Coupon %>
 <div class="giftvoucher" style="padding:10px; font-size:2em;">
 	<p>Code: <strong>$Code</strong></p>
-	<% if Type = Percent %>
+	<% if $Type = 'Percent' %>
 		<p>Percent: $Percent.Nice</p>
 	<% else %>
 		<p>Amount: $Amount.Nice</p>
 	<% end_if %>
-	
-	<% if EndDate %>
+
+	<% if $EndDate %>
 		<p>This voucher must be used by $EndDate.Long</p>
 	<% end_if %>
 </div>
-<% end_with %>
+<% end_with %>
diff --git a/tests/CalculatorTest.php b/tests/CalculatorTest.php
@@ -3,8 +3,8 @@
 namespace SilverShop\Discounts\Tests;
 
 use SilverShop\Discounts\Calculator;
-use SilverShop\Discount\Adjustment;
-use SilverShop\Discount\PriceInfo;
+use SilverShop\Discounts\Adjustment;
+use SilverShop\Discounts\PriceInfo;
 use SilverStripe\Dev\SapphireTest;
 use SilverShop\Tests\ShopTest;
 use SilverShop\Model\Order;
@@ -88,7 +88,7 @@ public function testBasicItemDiscount()
         $this->assertEquals(1, $discount->getDiscountValue(10), "10% of 10 is 1");
         //check that discount matches order
         $matching = Discount::get_matching($this->cart);
-        $this->assertDOSEquals(
+        $this->assertListEquals(
             [
             ["Title" => "10% off"]
             ],
@@ -138,7 +138,7 @@ function testItemLevelPercentAndAmountDiscounts()
 
         //check that discount matches order
         $matching = Discount::get_matching($this->cart);
-        $this->assertDOSEquals(
+        $this->assertListEquals(
             [
             ["Title" => "10% off"],
             ["Title" => "$5 off"]
@@ -162,7 +162,7 @@ function testItemLevelPercentAndAmountDiscounts()
         $calculator = new Calculator($this->megacart);
         $this->assertEquals(190, $calculator->calculate(), "complex savings example");
 
-        $this->assertDOSEquals(
+        $this->assertListEquals(
             [
             ["Title" => "10% off"],
             ["Title" => "$5 off"]

diff --git a/tests/CategoriesDiscountConstraintTest.php b/tests/CategoriesDiscountConstraintTest.php
@@ -6,26 +6,29 @@
 use SilverStripe\Dev\SapphireTest;
 use SilverShop\Tests\ShopTest;
 use SilverShop\Discounts\Model\OrderDiscount;
+use SilverShop\Model\Order;
+use SilverShop\Page\Product;
+use SilverShop\Page\ProductCategory;
 
 class CategoriesDiscountConstraintTest extends SapphireTest
 {
 
     protected static $fixture_file = [
         'shop.yml',
-        'Carts.yml'
+        'vendor/silvershop/core/tests/php/Fixtures/Carts.yml'
     ];
 
     public function setUp()
     {
         parent::setUp();
         ShopTest::setConfiguration();
 
-        $this->socks = $this->objFromFixture("Product", "socks");
-        $this->socks->publish("Stage", "Live");
-        $this->tshirt = $this->objFromFixture("Product", "tshirt");
-        $this->tshirt->publish("Stage", "Live");
-        $this->mp3player = $this->objFromFixture("Product", "mp3player");
-        $this->mp3player->publish("Stage", "Live");
+        $this->socks = $this->objFromFixture(Product::class, "socks");
+        $this->socks->publishRecursive();
+        $this->tshirt = $this->objFromFixture(Product::class, "tshirt");
+        $this->tshirt->publishRecursive();
+        $this->mp3player = $this->objFromFixture(Product::class, "mp3player");
+        $this->mp3player->publishRecursive();
 
         $this->cart = $this->objFromFixture(Order::class, "cart");
         $this->othercart = $this->objFromFixture(Order::class, "othercart");
@@ -41,8 +44,11 @@ public function testCategoryDiscount()
             "Percent" => 0.05
             ]
         );
+
         $discount->write();
-        $discount->Categories()->add($this->objFromFixture("ProductCategory", "clothing"));
+        $discount->Categories()->add(
+            $this->objFromFixture(ProductCategory::class, "clothing")
+        );
 
         $this->assertTrue($discount->validateOrder($this->cart), "Order contains a t-shirt. ".$discount->getMessage());
         $calculator = new Calculator($this->cart);
@@ -54,7 +60,10 @@ public function testCategoryDiscount()
 
         $discount->Categories()->removeAll();
 
-        $discount->Categories()->add($this->objFromFixture("ProductCategory", "kites"));
+        $discount->Categories()->add(
+            $this->objFromFixture(ProductCategory::class, "kites")
+        );
+
         $this->assertTrue($discount->validateOrder($this->kitecart), "Order contains a kite. ".$discount->getMessage());
         $calculator = new Calculator($this->kitecart);
         $this->assertEquals($calculator->calculate(), 1.75, "5% discount for kite in cart");

diff --git a/tests/CouponFormTest.php b/tests/CouponFormTest.php
@@ -9,13 +9,14 @@
 use SilverStripe\Control\Session;
 use SilverShop\Discounts\Model\OrderCoupon;
 use SilverShop\Discounts\Form\CouponForm;
+use SilverShop\Model\Order;
 
 class CouponFormTest extends FunctionalTest
 {
 
     protected static $fixture_file = [
         'shop.yml',
-        'Pages.yml'
+        'Page.yml'
     ];
 
     protected function setUp()

diff --git a/tests/GiftVoucherTest.php b/tests/GiftVoucherTest.php
@@ -26,7 +26,7 @@ public function setUp()
 
     public function testCusomisableVoucher()
     {
-        $controller =  new GiftVoucherProduct_Controller($this->variable);
+        $controller =  new GiftVoucherProductController($this->variable);
         $form = $controller->Form();
 
         $form->loadDataFrom(

diff --git a/tests/GiftVouchers.yml b/tests/GiftVouchers.yml
@@ -19,5 +19,5 @@ SilverShop\Model\Order:
 
 SilverShop\Discounts\Model\GiftVoucherOrderItem:
     giftcart_10fixed:
-        Product: '=>SilverShop\Discounts\Page\GiftVoucherProduct.10fixed'
+        Product: =>SilverShop\Discounts\Page\GiftVoucherProduct.10fixed
         Quantity: 2
diff --git a/tests/GroupDiscountConstraintTest.php b/tests/GroupDiscountConstraintTest.php
@@ -4,8 +4,10 @@
 
 use SilverStripe\Dev\SapphireTest;
 use SilverShop\Tests\ShopTest;
-
+use SilverShop\Model\Order;
 use SilverShop\Discounts\Model\OrderCoupon;
+use SilverStripe\Security\Group;
+use SilverStripe\Security\Member;
 
 class GroupDiscountConstraintTest extends SapphireTest
 {
@@ -31,7 +33,7 @@ public function testMemberGroup()
             "Type" => "Percent",
             "Percent" => 0.9,
             "Active" => 1,
-            "GroupID" => $this->objFromFixture("Group", "resellers")->ID
+            "GroupID" => $this->objFromFixture(Group::class, "resellers")->ID
             ]
         );
         $coupon->write();

diff --git a/tests/MembershipDiscountConstraintTest.php b/tests/MembershipDiscountConstraintTest.php
@@ -4,7 +4,7 @@
 
 use SilverStripe\Dev\SapphireTest;
 use SilverShop\Tests\ShopTest;
-
+use SilverStripe\Security\Member;
 use SilverShop\Discounts\Model\OrderDiscount;
 
 class MembershipDiscountConstraintTest extends SapphireTest
@@ -32,12 +32,12 @@ public function testMembership()
         );
         $discount->write();
 
-        $member = $this->objFromFixture("Member", "joebloggs");
+        $member = $this->objFromFixture(Member::class, "joebloggs");
         $discount->Members()->add($member);
 
         $this->assertFalse($discount->validateOrder($this->cart), "Invalid, because no member");
         $context = [
-            "Member" => $this->objFromFixture("Member", "bobjones")
+            "Member" => $this->objFromFixture(Member::class, "bobjones")
         ];
         $this->assertFalse($discount->validateOrder($this->cart, $context), "Invalid because wrong member present");
         $context = ["Member" => $member];

diff --git a/tests/OrderDiscountTest.php b/tests/OrderDiscountTest.php
@@ -7,6 +7,7 @@
 use SilverShop\Model\Order;
 use SilverShop\Discounts\Model\OrderDiscount;
 use SilverShop\Discounts\Model\Discount;
+use SilverStripe\Omnipay\Model\Payment;
 
 class OrderDiscountTest extends SapphireTest
 {
@@ -42,7 +43,7 @@ public function testManyMatches()
             ]
         )->write();
         $matches = OrderDiscount::get_matching($this->cart);
-        $this->assertDOSEquals(
+        $this->assertListEquals(
             [
             ["Title" => "10% off"],
             ["Title" => "$5 off"],
@@ -60,7 +61,7 @@ public function testPercent()
             "Percent" => 0.10
             ]
         )->write();
-        $this->assertDOSEquals(
+        $this->assertListEquals(
             [
             ["Title" => "10% off"]
             ],
@@ -77,7 +78,7 @@ public function testAmount()
             "Amount" => 5
             ]
         )->write();
-        $this->assertDOSEquals(
+        $this->assertListEquals(
             [
             ["Title" => "$5 off"]
             ],
@@ -89,8 +90,9 @@ public function testUseCount()
     {
         //check that order with payment started counts as a use
         $discount = $this->objFromFixture(OrderDiscount::class, "paymentused");
-        $payment = $this->objFromFixture("Payment", "paymentstarted_recent");
-        //set timeout to 60 minutes
+        $payment = $this->objFromFixture(Payment::class, "paymentstarted_recent");
+
+        // set timeout to 60 minutes
         Discount::config()->unpaid_use_timeout = 60;
         //set payment to be created 20 min ago
         $payment->Created = date('Y-m-d H:i:s', strtotime("-20 minutes"));

diff --git a/tests/PartialUseDiscount.yml b/tests/PartialUseDiscount.yml
@@ -10,10 +10,13 @@ SilverStripe\Security\Member:
   hubert:
     FirstName: Hubert
 
-SilverShop\Model\PartialUseDiscount:
+SilverShop\Discounts\Model\PartialUseDiscount:
   partial:
     Amount: 90
   constrained:
     Amount: 50
-    Products: '=>SilverShop\Page\Product.producta','=>SilverShop\Page\Product.productb'
-    Members: '=>SilverStripe\Security\Member.joe'
+    Products:
+      - =>SilverShop\Page\Product.producta
+      - =>SilverShop\Page\Product.productb
+    Members:
+      - =>SilverStripe\Security\Member.joe
diff --git a/tests/PartialUseDiscountTest.php b/tests/PartialUseDiscountTest.php
@@ -31,13 +31,13 @@ public function testCreateRemainder()
         //check constraints copying works
         $discount = $this->objFromFixture(PartialUseDiscount::class, "constrained");
         $remainder = $discount->createRemainder(40);
-        $this->assertDOSEquals(
+        $this->assertListEquals(
             [
             ["FirstName" => "Joe"]
             ],
             $remainder->Members()
         );
-        $this->assertDOSEquals(
+        $this->assertListEquals(
             [
             ["Title" => "ProductA"],
             ["Title" => "ProductB"]