From 3d9fd4d31f93da7b0ad4d13d5cec8ef8dbda1e11 Mon Sep 17 00:00:00 2001
From: Uryvskiy Dima <uryvskiydima@gmail.com>
Date: Tue, 10 Oct 2023 22:35:06 +0300
Subject: [PATCH] Fix tests

---
 intaro.retailcrm/classes/general/RCrmActions.php             | 1 +
 .../classes/general/services/RetailCrmService.php            | 5 +++--
 tests/classes/general/order/RetailCrmOrder_v5Test.php        | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/intaro.retailcrm/classes/general/RCrmActions.php b/intaro.retailcrm/classes/general/RCrmActions.php
index 8157598d..44ca24c7 100644
--- a/intaro.retailcrm/classes/general/RCrmActions.php
+++ b/intaro.retailcrm/classes/general/RCrmActions.php
@@ -321,6 +321,7 @@ class RCrmActions
 
         /** @var \Intaro\RetailCrm\Service\Utils $utils */
         $utils = ServiceLocator::getOrCreate(\Intaro\RetailCrm\Service\Utils::class);
+
         return $utils->fromUTF8($str);
     }
 
diff --git a/intaro.retailcrm/classes/general/services/RetailCrmService.php b/intaro.retailcrm/classes/general/services/RetailCrmService.php
index 213fabea..2978eb6f 100644
--- a/intaro.retailcrm/classes/general/services/RetailCrmService.php
+++ b/intaro.retailcrm/classes/general/services/RetailCrmService.php
@@ -187,8 +187,9 @@ class RetailCrmService
         $countryList = [];
 
         if (file_exists($server . '/bitrix/modules/intaro.retailcrm/classes/general/config/country.xml')) {
-            $countrysFile = simplexml_load_file($server . '/bitrix/modules/intaro.retailcrm/classes/general/config/country.xml');
-            foreach ($countrysFile->country as $country) {
+            $countryFile = simplexml_load_file($server . '/bitrix/modules/intaro.retailcrm/classes/general/config/country.xml');
+
+            foreach ($countryFile->country as $country) {
                 $countryList[RCrmActions::fromJSON((string) $country->name)] = (string) $country->alpha;
             }
         }
diff --git a/tests/classes/general/order/RetailCrmOrder_v5Test.php b/tests/classes/general/order/RetailCrmOrder_v5Test.php
index 78d65795..eb76aeb4 100644
--- a/tests/classes/general/order/RetailCrmOrder_v5Test.php
+++ b/tests/classes/general/order/RetailCrmOrder_v5Test.php
@@ -154,6 +154,7 @@ class RetailCrmOrder_v5Test extends BitrixTestCase {
 
         $rcrmActions = Mockery::mock('alias:' . RCrmActions::class);
         $rcrmActions->shouldReceive('apiMethod')->withAnyArgs()->andReturn(true);
+        $rcrmActions->shouldReceive('fromJSON')->withAnyArgs()->andReturn('');
 
         $result = RetailCrmOrder::uploadOrders();