fix tests

Author: engcom-Charlie

app/code/Magento/Analytics/Test/Mftf/ActionGroup/AssertAdminAdvancedReportingPageUrlActionGroup.xml

@@ -15,6 +15,6 @@
 
         <switchToNextTab stepKey="switchToNewTab"/>
         <waitForPageLoad stepKey="waitForAdvancedReportingPageLoad"/>
-        <seeInCurrentUrl url="advancedreporting.rjmetrics.com/report" stepKey="seeAssertAdvancedReportingPageUrl"/>
+        <seeInCurrentUrl url="reports/advanced-reporting" stepKey="seeAssertAdvancedReportingPageUrl"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/Analytics/Test/Unit/Model/ReportUrlProviderTest.php

@@ -43,25 +43,10 @@ class ReportUrlProviderTest extends TestCase
      */
     private $flagManagerMock;
 
-    /**
-     * @var ObjectManagerHelper
-     */
-    private $objectManagerHelper;
-
     /**
      * @var ReportUrlProvider
      */
-    private $reportUrlProvider;
-
-    /**
-     * @var string
-     */
-    private $urlReportConfigPath = 'path/url/report';
-
-    /**
-     * @var string
-     */
-    private $urlReportDocConfigPath = 'analytics/url/documentation';
+    private $model;
 
     /**
      * @return void
@@ -76,52 +61,36 @@ protected function setUp(): void
 
         $this->flagManagerMock = $this->createMock(FlagManager::class);
 
-        $this->objectManagerHelper = new ObjectManagerHelper($this);
-
-        $this->reportUrlProvider = $this->objectManagerHelper->getObject(
-            ReportUrlProvider::class,
-            [
-                'config' => $this->configMock,
-                'analyticsToken' => $this->analyticsTokenMock,
-                'otpRequest' => $this->otpRequestMock,
-                'flagManager' => $this->flagManagerMock,
-                'urlReportConfigPath' => $this->urlReportConfigPath,
-            ]
-        );
+        $objectManagerHelper = new ObjectManagerHelper($this);
 
-        $this->reportUrlProvider = $this->objectManagerHelper->getObject(
+        $this->model = $objectManagerHelper->getObject(
             ReportUrlProvider::class,
             [
                 'config' => $this->configMock,
                 'analyticsToken' => $this->analyticsTokenMock,
                 'otpRequest' => $this->otpRequestMock,
                 'flagManager' => $this->flagManagerMock,
-                'urlReportDocConfigPath' => $this->urlReportDocConfigPath,
             ]
         );
     }
 
     /**
      * @param bool $isTokenExist
      * @param string|null $otp If null OTP was not received.
+     * @param string $configPath
+     * @return void
      *
-     * @throws SubscriptionUpdateException
      * @dataProvider getUrlDataProvider
      */
-    public function testGetUrl($isTokenExist, $otp)
+    public function testGetUrl(bool $isTokenExist, ?string $otp, string $configPath): void
     {
         $reportUrl = 'https://example.com/report';
         $url = '';
 
         $this->configMock
             ->expects($this->once())
             ->method('getValue')
-            ->with($this->urlReportConfigPath)
-            ->willReturn($reportUrl);
-        $this->configMock
-            ->expects($this->once())
-            ->method('getValue')
-            ->with($this->urlReportDocConfigPath)
+            ->with($configPath)
             ->willReturn($reportUrl);
         $this->analyticsTokenMock
             ->expects($this->once())
@@ -136,24 +105,24 @@ public function testGetUrl($isTokenExist, $otp)
         if ($isTokenExist && $otp) {
             $url = $reportUrl . '?' . http_build_query(['otp' => $otp], '', '&');
         }
-        $this->assertSame($url ?: $reportUrl, $this->reportUrlProvider->getUrl());
+
+        $this->assertSame($url ?: $reportUrl, $this->model->getUrl());
     }
 
     /**
      * @return array
      */
-    public function getUrlDataProvider()
+    public function getUrlDataProvider(): array
     {
         return [
-            'TokenDoesNotExist' => [false, null],
-            'TokenExistAndOtpEmpty' => [true, null],
-            'TokenExistAndOtpValid' => [true, '249e6b658877bde2a77bc4ab'],
+            'TokenDoesNotExist' => [false, null, 'analytics/url/documentation'],
+            'TokenExistAndOtpEmpty' => [true, null, 'analytics/url/report'],
+            'TokenExistAndOtpValid' => [true, '249e6b658877bde2a77bc4ab', 'analytics/url/report'],
         ];
     }
 
     /**
      * @return void
-     * @throws SubscriptionUpdateException
      */
     public function testGetUrlWhenSubscriptionUpdateRunning()
     {
@@ -163,6 +132,6 @@ public function testGetUrlWhenSubscriptionUpdateRunning()
             ->with(SubscriptionUpdateHandler::PREVIOUS_BASE_URL_FLAG_CODE)
             ->willReturn('http://store.com');
         $this->expectException(SubscriptionUpdateException::class);
-        $this->reportUrlProvider->getUrl();
+        $this->model->getUrl();
     }
 }

dev/tests/integration/testsuite/Magento/Analytics/Controller/Adminhtml/Reports/ShowTest.php

@@ -14,7 +14,7 @@
  */
 class ShowTest extends AbstractBackendController
 {
-    private const REPORT_HOST = 'advancedreporting.rjmetrics.com';
+    private const REPORT_HOST = 'docs.magento.com';
     /**
      * @inheritDoc
      */