Merge remote-tracking branch 'magento-l3/ACP2E-77' into L3_PR_21-12-13

Author: veloraven

app/code/Magento/Cron/Model/Config/Backend/Sitemap.php

@@ -21,12 +21,12 @@ class Sitemap extends \Magento\Framework\App\Config\Value
     /**
      * Cron string path for product alerts
      */
-    const CRON_STRING_PATH = 'crontab/default/jobs/sitemap_generate/schedule/cron_expr';
+    public const CRON_STRING_PATH = 'crontab/default/jobs/sitemap_generate/schedule/cron_expr';
 
     /**
      * Cron mode path
      */
-    const CRON_MODEL_PATH = 'crontab/default/jobs/sitemap_generate/run/model';
+    public const CRON_MODEL_PATH = 'crontab/default/jobs/sitemap_generate/run/model';
 
     /**
      * @var \Magento\Framework\App\Config\ValueFactory
@@ -73,8 +73,12 @@ public function __construct(
      */
     public function afterSave()
     {
-        $time = $this->getData('groups/generate/fields/time/value');
-        $frequency = $this->getData('groups/generate/fields/frequency/value');
+        $time = $this->getData('groups/generate/fields/time/value') ?:
+            explode(
+                ',',
+                $this->_config->getValue('sitemap/generate/time', $this->getScope(), $this->getScopeId()) ?: '0,0,0'
+            );
+        $frequency = $this->getValue();
 
         $cronExprArray = [
             (int)($time[1] ?? 0), //Minute

dev/tests/integration/testsuite/Magento/Cron/Model/Config/Backend/SitemapTest.php

@@ -0,0 +1,98 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Cron\Model\Config\Backend;
+
+use Magento\Config\Model\Config as ConfigModel;
+use Magento\Config\Model\PreparedValueFactory;
+use Magento\Cron\Model\Config\Source\Frequency;
+use Magento\Framework\App\Config\ValueFactory;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @magentoAppArea adminhtml
+ */
+class SitemapTest extends TestCase
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+    }
+
+    /**
+     * @dataProvider frequencyDataProvider
+     * @param string $frequency
+     * @param string $expectedCronExpr
+     */
+    public function testDirectSave(string $frequency, string $expectedCronExpr): void
+    {
+        $preparedValueFactory = $this->objectManager->get(PreparedValueFactory::class);
+        /** @var Sitemap $sitemapValue */
+        $sitemapValue = $preparedValueFactory->create('sitemap/generate/frequency', $frequency, 'default', 0);
+        $sitemapValue->save();
+
+        self::assertEquals($expectedCronExpr, $this->getCronExpression());
+    }
+
+    /**
+     * @dataProvider frequencyDataProvider
+     * @param string $frequency
+     * @param string $expectedCronExpr
+     */
+    public function testSaveFromAdmin(string $frequency, string $expectedCronExpr): void
+    {
+        $config = $this->objectManager->create(ConfigModel::class);
+        $config->setSection('sitemap');
+        $config->setGroups(
+            [
+                'generate' => [
+                    'fields' => [
+                        'time' => ['value' => ['00', '00', '00']],
+                        'frequency' => ['value' => $frequency],
+                    ],
+                ],
+            ]
+        );
+        $config->save();
+
+        self::assertEquals($expectedCronExpr, $this->getCronExpression());
+    }
+
+    /**
+     * @return array
+     */
+    public function frequencyDataProvider(): array
+    {
+        return [
+            'daily' => [Frequency::CRON_DAILY, '0 0 * * *'],
+            'weekly' => [Frequency::CRON_WEEKLY, '0 0 * * 1'],
+            'monthly' => [Frequency::CRON_MONTHLY, '0 0 1 * *'],
+        ];
+    }
+
+    /**
+     * @return string
+     */
+    private function getCronExpression(): string
+    {
+        $valueFactory = $this->objectManager->get(ValueFactory::class);
+        $cronExprValue = $valueFactory->create()
+            ->load(Sitemap::CRON_STRING_PATH, 'path');
+
+        return $cronExprValue->getValue();
+    }
+}