From d03d218b180b35a9a130406493a9510f983869cc Mon Sep 17 00:00:00 2001 From: Ivan Chaplygin Date: Thu, 16 May 2024 18:09:16 +0300 Subject: [PATCH] ref #72069 Fix tests --- tests/datasets/data-loyalty-retailcrm.php | 30 ++++++++----------- tests/test-wc-retailcrm-loyalty.php | 16 ++++++++-- .../test-wc-retailcrm-loyalty-validator.php | 10 ++++--- 3 files changed, 32 insertions(+), 24 deletions(-) diff --git a/tests/datasets/data-loyalty-retailcrm.php b/tests/datasets/data-loyalty-retailcrm.php index a08fb06..082ccb3 100644 --- a/tests/datasets/data-loyalty-retailcrm.php +++ b/tests/datasets/data-loyalty-retailcrm.php @@ -78,25 +78,25 @@ class DataLoyaltyRetailCrm 'responseApiMethod' => [], 'wcUserType' => 'individual', 'throwMessage' => 'User not found in the system', - 'isCorpActive' => false + 'isCorpActive' => 'no' ], [ 'responseApiMethod' => ['customer' => ['id' => 1]], 'wcUserType' => 'corp', 'throwMessage' => 'This user is a corporate person', - 'isCorpActive' => true, + 'isCorpActive' => 'yes', ], [ 'responseApiMethod' => ['customer' => ['id' => 1]], 'wcUserType' => 'corp', 'throwMessage' => null, - 'isCorpActive' => false, + 'isCorpActive' => 'no', ], [ 'responseApiMethod' => ['customer' => ['id' => 1]], 'wcUserType' => 'individual', 'throwMessage' => null, - 'isCorpActive' => true, + 'isCorpActive' => 'yes', ], ]; } @@ -241,24 +241,20 @@ class DataLoyaltyRetailCrm public static function dataGetEmailsForPersonalCoupon() { - $data = [ + return [ [ - 'email' => 'test1@gmail.com' + 'email' => 'test1@gmail.com', + 'code' => 'loyalty' . mt_rand() ], [ - 'email' => 'test2@gmail.com' + 'email' => 'test2@gmail.com', + 'code' => 'loyalty' . mt_rand() + ], + [ + 'email' => 'test3@gmail.com', + 'expectedCode' => false ] ]; - - $coupons = self::createCoupons(); - $data[0]['expectedCode'] = $coupons[0]->get_code(); - $data[1]['expectedCode'] = $coupons[1]->get_code(); - $data[2] = [ - 'email' => 'test3@gmail.com', - 'expectedCode' => false - ]; - - return $data; } public static function dataValidUser() diff --git a/tests/test-wc-retailcrm-loyalty.php b/tests/test-wc-retailcrm-loyalty.php index 07b7ad9..d0e11b3 100644 --- a/tests/test-wc-retailcrm-loyalty.php +++ b/tests/test-wc-retailcrm-loyalty.php @@ -134,11 +134,21 @@ class WC_Retailcrm_Loyalty_Test extends WC_Retailcrm_Test_Case_Helper /** * @dataProvider DataLoyaltyRetailCrm::dataGetEmailsForPersonalCoupon() */ - public function testGetCouponLoyalty($email, $expectedCode) + public function testGetCouponLoyalty($email, $code) { + if ($code) { + $coupon = new WC_Coupon(); + + $coupon->set_usage_limit(0); + $coupon->set_amount(100); + $coupon->set_email_restrictions($email); + $coupon->set_code($code); + $coupon->save(); + } + $coupons = $this->loyalty->getCouponLoyalty($email); - if (!$coupons && $expectedCode === false) { + if (!$coupons && $code === false) { $this->assertTrue(true); } else { $result = false; @@ -147,7 +157,7 @@ class WC_Retailcrm_Loyalty_Test extends WC_Retailcrm_Test_Case_Helper $coupon = new WC_Coupon($item['code']); $result = true; - $this->assertTrue($expectedCode === $item['code']); + $this->assertTrue($code === $item['code']); $coupon->delete(true); } diff --git a/tests/validators/test-wc-retailcrm-loyalty-validator.php b/tests/validators/test-wc-retailcrm-loyalty-validator.php index 521a1ec..5640f69 100644 --- a/tests/validators/test-wc-retailcrm-loyalty-validator.php +++ b/tests/validators/test-wc-retailcrm-loyalty-validator.php @@ -1,6 +1,6 @@ corpClient->save(); } - /** @dataProvider datasets\DataLoyaltyRetailCrm::dataCheckUser() */ + /** + * @dataProvider DataLoyaltyRetailCrm::dataCheckUser() + */ public function testCheckUser($responseApiMethod, $wcUserType, $throwMessage, $isCorpActive) { $this->setResponseMock(); @@ -57,7 +59,7 @@ class WC_Retailcrm_Loyalty_Validator_Test extends WC_Retailcrm_Test_Case_Helper } } - /** @dataProvider datasets\DataLoyaltyRetailCrm::dataLoyaltyAccount() */ + /** @dataProvider DataLoyaltyRetailCrm::dataLoyaltyAccount() */ public function testGetLoyaltyAccount($responseMock, $throwMessage) { $this->setResponseMock($responseMock); @@ -79,7 +81,7 @@ class WC_Retailcrm_Loyalty_Validator_Test extends WC_Retailcrm_Test_Case_Helper } } - /** @dataProvider datasets\DataLoyaltyRetailCrm::dataCheckActiveLoyalty() */ + /** @dataProvider DataLoyaltyRetailCrm::dataCheckActiveLoyalty() */ public function testCheckActivateLoyalty($responseMock, $throwMessage) { $this->setResponseMock($responseMock);