MC-31766: [AR] Report account is unavailable after URL change

Author: fascinosum

app/code/Magento/Analytics/Cron/Update.php

@@ -76,7 +76,7 @@ public function execute()
         $attemptsCount = (int)$this->flagManager
             ->getFlagData(SubscriptionUpdateHandler::SUBSCRIPTION_UPDATE_REVERSE_COUNTER_FLAG_CODE);
 
-        if (($attemptsCount >= 0) && $this->analyticsToken->isTokenExist()) {
+        if (($attemptsCount > 0) && $this->analyticsToken->isTokenExist()) {
             $attemptsCount--;
             $this->flagManager
                 ->saveFlag(SubscriptionUpdateHandler::SUBSCRIPTION_UPDATE_REVERSE_COUNTER_FLAG_CODE, $attemptsCount);

app/code/Magento/Analytics/Test/Unit/Cron/UpdateTest.php

@@ -11,6 +11,7 @@
 use Magento\Analytics\Model\Connector;
 use Magento\Framework\App\Config\ReinitableConfigInterface;
 use Magento\Framework\App\Config\Storage\WriterInterface;
+use Magento\Framework\Exception\NotFoundException;
 use Magento\Framework\FlagManager;
 
 class UpdateTest extends \PHPUnit\Framework\TestCase
@@ -45,6 +46,9 @@ class UpdateTest extends \PHPUnit\Framework\TestCase
      */
     private $update;
 
+    /**
+     * @inheritDoc
+     */
     protected function setUp()
     {
         $this->connectorMock =  $this->getMockBuilder(Connector::class)
@@ -74,6 +78,7 @@ protected function setUp()
 
     /**
      * @return void
+     * @throws NotFoundException
      */
     public function testExecuteWithoutToken()
     {
@@ -82,12 +87,12 @@ public function testExecuteWithoutToken()
             ->with(SubscriptionUpdateHandler::SUBSCRIPTION_UPDATE_REVERSE_COUNTER_FLAG_CODE)
             ->willReturn(10);
         $this->connectorMock
-            ->expects($this->once())
+            ->expects($this->never())
             ->method('execute')
             ->with('update')
             ->willReturn(false);
         $this->analyticsTokenMock
-            ->expects($this->once())
+            ->expects($this->any())
             ->method('isTokenExist')
             ->willReturn(false);
         $this->addFinalOutputAsserts();
@@ -120,6 +125,7 @@ private function addFinalOutputAsserts(bool $isExecuted = true)
      * @param $counterData
      * @return void
      * @dataProvider executeWithEmptyReverseCounterDataProvider
+     * @throws NotFoundException
      */
     public function testExecuteWithEmptyReverseCounter($counterData)
     {
@@ -159,6 +165,7 @@ public function executeWithEmptyReverseCounterDataProvider()
      * @param bool $functionResult
      * @return void
      * @dataProvider executeRegularScenarioDataProvider
+     * @throws NotFoundException
      */
     public function testExecuteRegularScenario(
         int $reverseCount,
@@ -170,6 +177,10 @@ public function testExecuteRegularScenario(
             ->method('getFlagData')
             ->with(SubscriptionUpdateHandler::SUBSCRIPTION_UPDATE_REVERSE_COUNTER_FLAG_CODE)
             ->willReturn($reverseCount);
+        $this->flagManagerMock
+            ->expects($this->once())
+            ->method('saveFlag')
+            ->with(SubscriptionUpdateHandler::SUBSCRIPTION_UPDATE_REVERSE_COUNTER_FLAG_CODE, $reverseCount - 1);
         $this->connectorMock
             ->expects($this->once())
             ->method('execute')

dev/tests/integration/testsuite/Magento/Analytics/Cron/UpdateTest.php

@@ -21,6 +21,7 @@
 
 /**
  * @magentoAppArea adminhtml
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class UpdateTest extends \PHPUnit\Framework\TestCase
 {