From 5ad76885033b3d9cfac2c8331f7322cc5e0514d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Werner=20Krau=C3=9F?= <werner.krauss@netwerkstatt.at>
Date: Tue, 20 Feb 2024 12:53:41 +0100
Subject: [PATCH] fix a few failing tests

---
 src/Model/PartialUseDiscount.php            | 2 +-
 tests/GiftVoucherTest.php                   | 4 ++--
 tests/OrderCouponTest.php                   | 6 +++---
 tests/ProductTypeDiscountConstraintTest.php | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Model/PartialUseDiscount.php b/src/Model/PartialUseDiscount.php
index 9766d3b..2756868 100644
--- a/src/Model/PartialUseDiscount.php
+++ b/src/Model/PartialUseDiscount.php
@@ -92,7 +92,7 @@ public function validate()
         //prevent vital things from changing
         foreach (self::$defaults as $field => $value) {
             if ($this->isChanged($field)) {
-                $result->error("$field should not be changed for partial use discounts.");
+                $result->addError("$field should not be changed for partial use discounts.");
             }
         }
 
diff --git a/tests/GiftVoucherTest.php b/tests/GiftVoucherTest.php
index f5e9d2d..de69635 100644
--- a/tests/GiftVoucherTest.php
+++ b/tests/GiftVoucherTest.php
@@ -17,10 +17,10 @@ public function setUp(): void
         parent::setUp();
 
         $this->variable = $this->objFromFixture(GiftVoucherProduct::class, 'variable');
-        $this->variable->publish('Stage', 'Live');
+        $this->variable->copyVersionToStage('Stage', 'Live');
 
         $this->fixed10 = $this->objFromFixture(GiftVoucherProduct::class, '10fixed');
-        $this->fixed10->publish('Stage', 'Live');
+        $this->fixed10->copyVersionToStage('Stage', 'Live');
     }
 
     public function testCusomisableVoucher()
diff --git a/tests/OrderCouponTest.php b/tests/OrderCouponTest.php
index 72ced6c..c8a6df9 100644
--- a/tests/OrderCouponTest.php
+++ b/tests/OrderCouponTest.php
@@ -22,7 +22,7 @@ public function setUp(): void
         parent::setUp();
         ShopTest::setConfiguration();
 
-        Config::inst()->merge(OrderCoupon::class, 'minimum_code_length', null);
+        Config::inst()->set(OrderCoupon::class, 'minimum_code_length', null);
 
         $this->socks = $this->objFromFixture(Product::class, 'socks');
         $this->socks->publishRecursive();
@@ -38,7 +38,7 @@ public function setUp(): void
 
     public function testMinimumLengthCode()
     {
-        Config::inst()->update(OrderCoupon::class, 'minimum_code_length', 8);
+        Config::inst()->set(OrderCoupon::class, 'minimum_code_length', 8);
         $coupon = new OrderCoupon();
         $coupon->Code = '1234567';
         $result = $coupon->validate();
@@ -52,7 +52,7 @@ public function testMinimumLengthCode()
         $result = $coupon->validate();
         self::assertNotContains('INVALIDMINLENGTH', $result->getMessages());
 
-        Config::inst()->update(OrderCoupon::class, 'minimum_code_length', null);
+        Config::inst()->set(OrderCoupon::class, 'minimum_code_length', null);
 
         $coupon = new OrderCoupon(['Code' => '1']);
         $result = $coupon->validate();
diff --git a/tests/ProductTypeDiscountConstraintTest.php b/tests/ProductTypeDiscountConstraintTest.php
index 564b7da..cec4b61 100644
--- a/tests/ProductTypeDiscountConstraintTest.php
+++ b/tests/ProductTypeDiscountConstraintTest.php
@@ -40,7 +40,7 @@ public function setUp(): void
         $this->mp3player->publishRecursive();
 
         $this->voucher = $this->objFromFixture(GiftVoucherProduct::class, '10fixed');
-        $this->voucher->publish('Stage', 'Live');
+        $this->voucher->copyVersionToStage('Stage', 'Live');
     }
 
     public function testProducts()