issue-resolution/plugin-version (#189)

* fixed issue with the plugin version in browser events

* updated unit tests

* fixed static test issues

Author: priyambad

app/code/Meta/BusinessExtension/Helper/FBEHelper.php

@@ -27,7 +27,6 @@
 use Magento\Framework\App\ProductMetadata as FrameworkProductMetaData;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\HTTP\Client\Curl;
-use Magento\Framework\Module\ModuleListInterface;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\UrlInterface;
 use Meta\BusinessExtension\Model\System\Config as SystemConfig;
@@ -75,11 +74,6 @@ class FBEHelper extends AbstractHelper
      */
     private $resourceConnection;
 
-    /**
-     * @var ModuleListInterface
-     */
-    private $moduleList;
-
     /**
      * @var SystemConfig
      */
@@ -99,7 +93,6 @@ class FBEHelper extends AbstractHelper
      * @param StoreManagerInterface $storeManager
      * @param Curl $curl
      * @param ResourceConnection $resourceConnection
-     * @param ModuleListInterface $moduleList
      * @param SystemConfig $systemConfig
      * @param ProductMetadataInterface $productMetadata
      */
@@ -110,7 +103,6 @@ public function __construct(
         StoreManagerInterface $storeManager,
         Curl $curl,
         ResourceConnection $resourceConnection,
-        ModuleListInterface $moduleList,
         SystemConfig $systemConfig,
         ProductMetadataInterface $productMetadata
     ) {
@@ -120,7 +112,6 @@ public function __construct(
         $this->logger = $logger;
         $this->curl = $curl;
         $this->resourceConnection = $resourceConnection;
-        $this->moduleList = $moduleList;
         $this->systemConfig = $systemConfig;
         $this->productMetadata = $productMetadata;
     }
@@ -142,7 +133,7 @@ public function getMagentoVersion(): string
      */
     public function getPluginVersion()
     {
-        return $this->moduleList->getOne(self::MODULE_NAME)['setup_version'];
+        return $this->systemConfig->getModuleVersion();
     }
 
     /**
@@ -152,7 +143,8 @@ public function getPluginVersion()
      */
     public function getSource(): string
     {
-        return $this->productMetadata->getEdition() == FrameworkProductMetaData::EDITION_NAME ? 'magento_opensource' : 'adobe_commerce';
+        return $this->productMetadata->getEdition() == FrameworkProductMetaData::EDITION_NAME
+            ? 'magento_opensource' : 'adobe_commerce';
     }
 
     /**
@@ -448,7 +440,6 @@ public function deleteConfigKeys($storeId)
         return $this;
     }
 
-
     /**
      * Is updated version
      *

app/code/Meta/BusinessExtension/Test/Unit/Helper/FBEHelperTest.php

@@ -23,7 +23,6 @@
 use Magento\Framework\App\ProductMetadataInterface;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\HTTP\Client\Curl;
-use Magento\Framework\Module\ModuleListInterface;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Meta\BusinessExtension\Model\System\Config;
@@ -43,9 +42,9 @@ class FBEHelperTest extends TestCase
     private $objectManagerInterface;
 
     /**
-     * @var MockObject
+     * @var Config
      */
-    private $moduleList;
+    private $systemConfig;
 
     /**
      * @var ProductMetadataInterface|MockObject
@@ -74,8 +73,7 @@ public function setUp(): void
         $storeManager = $this->createMock(StoreManagerInterface::class);
         $curl = $this->createMock(Curl::class);
         $resourceConnection = $this->createMock(ResourceConnection::class);
-        $this->moduleList = $this->createMock(ModuleListInterface::class);
-        $systemConfig = $this->createMock(Config::class);
+        $this->systemConfig = $this->createMock(Config::class);
         $this->productMetaData = $this->createMock(ProductMetadataInterface::class);
         $this->fbeHelper = new FBEHelper(
             $context,
@@ -84,8 +82,7 @@ public function setUp(): void
             $storeManager,
             $curl,
             $resourceConnection,
-            $this->moduleList,
-            $systemConfig,
+            $this->systemConfig,
             $this->productMetaData
         );
     }
@@ -99,18 +96,14 @@ public function testCorrectPartnerAgent()
     {
         $magentoVersion = '2.3.5';
         $pluginVersion = '1.0.0';
-        $this->moduleList->method('getOne')->willReturn(
-            [
-                'setup_version' => $pluginVersion
-            ]
-        );
         $source = $this->fbeHelper->getSource();
         $productMetadata = $this->getMockBuilder(ProductMetadataInterface::class)
             ->disableOriginalConstructor()
             ->setMethods(['getVersion', 'getEdition', 'getName'])
             ->getMock();
         $this->productMetaData->expects($this->once())->method('getVersion')->willReturn($magentoVersion);
         $this->objectManagerInterface->method('get')->willReturn($productMetadata);
+        $this->systemConfig->method('getModuleVersion')->willReturn($pluginVersion);
         $this->assertEquals(
             sprintf('%s-%s-%s', $source, $magentoVersion, $pluginVersion),
             $this->fbeHelper->getPartnerAgent(true)