[EngCom] Public Pull Requests - 2.3-develop

magento-engcom-team · web-flow · commit 04d756b81389 · 2018-04-28T07:48:05.000+03:00
- merged latest code from mainline branch
diff --git a/app/code/Magento/Bundle/composer.json b/app/code/Magento/Bundle/composer.json
@@ -25,7 +25,7 @@
     },
     "suggest": {
         "magento/module-webapi": "*",
-        "magento/module-bundle-sample-data": "Sample Data version:100.3.*"
+        "magento/module-bundle-sample-data": "*"
     },
     "type": "magento2-module",
     "license": [
diff --git a/app/code/Magento/Catalog/composer.json b/app/code/Magento/Catalog/composer.json
@@ -34,7 +34,7 @@
     "suggest": {
         "magento/module-cookie": "*",
         "magento/module-sales": "*",
-        "magento/module-catalog-sample-data": "Sample Data version:100.3.*"
+        "magento/module-catalog-sample-data": "*"
     },
     "type": "magento2-module",
     "license": [
diff --git a/app/code/Magento/CatalogRule/composer.json b/app/code/Magento/CatalogRule/composer.json
@@ -17,7 +17,7 @@
     },
     "suggest": {
         "magento/module-import-export": "*",
-        "magento/module-catalog-rule-sample-data": "Sample Data version:100.3.*"
+        "magento/module-catalog-rule-sample-data": "*"
     },
     "type": "magento2-module",
     "license": [
diff --git a/app/code/Magento/Cms/composer.json b/app/code/Magento/Cms/composer.json
@@ -18,7 +18,7 @@
         "magento/module-widget": "*"
     },
     "suggest": {
-        "magento/module-cms-sample-data": "Sample Data version:100.3.*"
+        "magento/module-cms-sample-data": "*"
     },
     "type": "magento2-module",
     "license": [
diff --git a/app/code/Magento/ConfigurableProduct/composer.json b/app/code/Magento/ConfigurableProduct/composer.json
@@ -23,8 +23,8 @@
         "magento/module-webapi": "*",
         "magento/module-sales": "*",
         "magento/module-product-video": "*",
-        "magento/module-configurable-sample-data": "Sample Data version:100.3.*",
-        "magento/module-product-links-sample-data": "Sample Data version:100.3.*"
+        "magento/module-configurable-sample-data": "*",
+        "magento/module-product-links-sample-data": "*"
     },
     "type": "magento2-module",
     "license": [
diff --git a/app/code/Magento/Customer/composer.json b/app/code/Magento/Customer/composer.json
@@ -29,7 +29,7 @@
     },
     "suggest": {
         "magento/module-cookie": "*",
-        "magento/module-customer-sample-data": "Sample Data version:100.3.*"
+        "magento/module-customer-sample-data": "*"
     },
     "type": "magento2-module",
     "license": [
diff --git a/app/code/Magento/Downloadable/composer.json b/app/code/Magento/Downloadable/composer.json
@@ -25,7 +25,7 @@
         "magento/module-ui": "*"
     },
     "suggest": {
-        "magento/module-downloadable-sample-data": "Sample Data version:100.3.*"
+        "magento/module-downloadable-sample-data": "*"
     },
     "type": "magento2-module",
     "license": [
diff --git a/app/code/Magento/GroupedProduct/composer.json b/app/code/Magento/GroupedProduct/composer.json
@@ -21,7 +21,7 @@
         "magento/module-ui": "*"
     },
     "suggest": {
-        "magento/module-grouped-product-sample-data": "Sample Data version:100.3.*"
+        "magento/module-grouped-product-sample-data": "*"
     },
     "type": "magento2-module",
     "license": [
diff --git a/app/code/Magento/Msrp/composer.json b/app/code/Magento/Msrp/composer.json
@@ -16,7 +16,7 @@
     },
     "suggest": {
         "magento/module-bundle": "*",
-        "magento/module-msrp-sample-data": "Sample Data version:100.3.*"
+        "magento/module-msrp-sample-data": "*"
     },
     "type": "magento2-module",
     "license": [
diff --git a/app/code/Magento/OfflineShipping/composer.json b/app/code/Magento/OfflineShipping/composer.json
@@ -19,7 +19,7 @@
     },
     "suggest": {
         "magento/module-checkout": "*",
-        "magento/module-offline-shipping-sample-data": "Sample Data version:100.3.*"
+        "magento/module-offline-shipping-sample-data": "*"
     },
     "type": "magento2-module",
     "license": [
diff --git a/app/code/Magento/Review/composer.json b/app/code/Magento/Review/composer.json
@@ -18,7 +18,7 @@
     },
     "suggest": {
         "magento/module-cookie": "*",
-        "magento/module-review-sample-data": "Sample Data version:100.3.*"
+        "magento/module-review-sample-data": "*"
     },
     "type": "magento2-module",
     "license": [
diff --git a/app/code/Magento/Sales/composer.json b/app/code/Magento/Sales/composer.json
@@ -33,7 +33,7 @@
         "magento/module-wishlist": "*"
     },
     "suggest": {
-        "magento/module-sales-sample-data": "Sample Data version:100.3.*"
+        "magento/module-sales-sample-data": "*"
     },
     "type": "magento2-module",
     "license": [
diff --git a/app/code/Magento/SalesRule/composer.json b/app/code/Magento/SalesRule/composer.json
@@ -25,7 +25,7 @@
         "magento/module-widget": "*"
     },
     "suggest": {
-        "magento/module-sales-rule-sample-data": "Sample Data version:100.3.*"
+        "magento/module-sales-rule-sample-data": "*"
     },
     "type": "magento2-module",
     "license": [
diff --git a/app/code/Magento/SampleData/Console/Command/SampleDataDeployCommand.php b/app/code/Magento/SampleData/Console/Command/SampleDataDeployCommand.php
@@ -68,7 +68,7 @@ public function __construct(
     protected function configure()
     {
         $this->setName('sampledata:deploy')
-            ->setDescription('Deploy sample data modules');
+            ->setDescription('Deploy sample data modules for composer-based Magento installations');
         $this->addOption(
             self::OPTION_NO_UPDATE,
             null,
@@ -83,6 +83,12 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
+        $rootJson = json_decode($this->filesystem->getDirectoryRead(DirectoryList::ROOT)->readFile("composer.json"));
+        if (!isset($rootJson->version)) {
+            // @codingStandardsIgnoreLine
+            $output->writeln('<info>' . 'Git installations must deploy sample data from GitHub; see https://devdocs.magento.com/guides/v2.3/install-gde/install/sample-data-after-clone.html for more information.' . '</info>');
+            return;
+        }
         $this->updateMemoryLimit();
         $this->createAuthFile();
         $sampleDataPackages = $this->sampleDataDependency->getSampleDataPackages();
diff --git a/app/code/Magento/SampleData/Model/Dependency.php b/app/code/Magento/SampleData/Model/Dependency.php
@@ -81,7 +81,7 @@ public function getSampleDataPackages()
         $suggests = array_merge($suggests, $this->getSuggestsFromModules());
         foreach ($suggests as $name => $version) {
             if (strpos($version, self::SAMPLE_DATA_SUGGEST) === 0) {
-                $installExtensions[$name] = substr($version, strlen(self::SAMPLE_DATA_SUGGEST));
+                $installExtensions[$name] = trim(substr($version, strlen(self::SAMPLE_DATA_SUGGEST)));
             }
         }
         return $installExtensions;
diff --git a/app/code/Magento/SampleData/Test/Unit/Console/Command/AbstractSampleDataCommandTest.php b/app/code/Magento/SampleData/Test/Unit/Console/Command/AbstractSampleDataCommandTest.php
@@ -83,6 +83,9 @@ protected function setupMocks(
         $additionalComposerArgs = []
     ) {
         $this->directoryReadMock->expects($this->any())->method('getAbsolutePath')->willReturn($pathToComposerJson);
+        $this->directoryReadMock->expects($this->any())->method('readFile')->with('composer.json')->willReturn(
+            '{"version": "0.0.1"}'
+        );
         $this->filesystemMock->expects($this->any())->method('getDirectoryRead')->with(DirectoryList::ROOT)->willReturn(
             $this->directoryReadMock
         );
diff --git a/app/code/Magento/SampleData/Test/Unit/Console/Command/SampleDataDeployCommandTest.php b/app/code/Magento/SampleData/Test/Unit/Console/Command/SampleDataDeployCommandTest.php
@@ -115,6 +115,15 @@ public function processDataProvider()
      */
     public function testExecuteWithException()
     {
+        $this->directoryReadMock->expects($this->once())
+            ->method('readFile')
+            ->with('composer.json')
+            ->willReturn('{"version": "0.0.1"}');
+        $this->filesystemMock->expects($this->once())
+            ->method('getDirectoryRead')
+            ->with(DirectoryList::ROOT)
+            ->willReturn($this->directoryReadMock);
+        
         $this->directoryWriteMock->expects($this->once())
             ->method('isExist')
             ->with(PackagesAuth::PATH_TO_AUTH_FILE)
diff --git a/app/code/Magento/SampleData/Test/Unit/Model/DependencyTest.php b/app/code/Magento/SampleData/Test/Unit/Model/DependencyTest.php
@@ -152,8 +152,8 @@ public static function dataPackagesFromComposerSuggest()
                     ];
                 },
                 'suggestions' => [
-                    'magento/foo-sample-data' => Dependency::SAMPLE_DATA_SUGGEST . '100.0.0',
-                    'thirdparty/bar-sample-data' => Dependency::SAMPLE_DATA_SUGGEST . '1.2.3',
+                    'magento/foo-sample-data' => Dependency::SAMPLE_DATA_SUGGEST . ' 100.0.0',
+                    'thirdparty/bar-sample-data' => Dependency::SAMPLE_DATA_SUGGEST . ' 1.2.3',
                     'thirdparty/something-else' => 'Just a suggested package',
                 ],
                 'expectedPackages' => [
diff --git a/app/code/Magento/SampleData/composer.json b/app/code/Magento/SampleData/composer.json
@@ -9,7 +9,7 @@
         "magento/framework": "*"
     },
     "suggest": {
-        "magento/sample-data-media": "Sample Data version:100.3.*"
+        "magento/sample-data-media": "*"
     },
     "type": "magento2-module",
     "license": [
diff --git a/app/code/Magento/Swatches/composer.json b/app/code/Magento/Swatches/composer.json
@@ -19,7 +19,7 @@
     },
     "suggest": {
         "magento/module-layered-navigation": "*",
-        "magento/module-swatches-sample-data": "Sample Data version:100.3.*"
+        "magento/module-swatches-sample-data": "*"
     },
     "type": "magento2-module",
     "license": [
diff --git a/app/code/Magento/Tax/composer.json b/app/code/Magento/Tax/composer.json
@@ -22,7 +22,7 @@
         "magento/module-store": "*"
     },
     "suggest": {
-        "magento/module-tax-sample-data": "Sample Data version:100.3.*"
+        "magento/module-tax-sample-data": "*"
     },
     "type": "magento2-module",
     "license": [
diff --git a/app/code/Magento/Theme/composer.json b/app/code/Magento/Theme/composer.json
@@ -20,7 +20,7 @@
     },
     "suggest": {
         "magento/module-translation": "*",
-        "magento/module-theme-sample-data": "Sample Data version:100.3.*",
+        "magento/module-theme-sample-data": "*",
         "magento/module-deploy": "*",
         "magento/module-directory": "*"
     },
diff --git a/app/code/Magento/Widget/composer.json b/app/code/Magento/Widget/composer.json
@@ -15,7 +15,7 @@
         "magento/module-variable": "*"
     },
     "suggest": {
-        "magento/module-widget-sample-data": "Sample Data version:100.3.*"
+        "magento/module-widget-sample-data": "*"
     },
     "type": "magento2-module",
     "license": [
diff --git a/app/code/Magento/Wishlist/composer.json b/app/code/Magento/Wishlist/composer.json
@@ -23,7 +23,7 @@
         "magento/module-bundle": "*",
         "magento/module-cookie": "*",
         "magento/module-grouped-product": "*",
-        "magento/module-wishlist-sample-data": "Sample Data version:100.3.*"
+        "magento/module-wishlist-sample-data": "*"
     },
     "type": "magento2-module",
     "license": [
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Model/BlockTest.php b/dev/tests/integration/testsuite/Magento/Cms/Model/BlockTest.php
@@ -9,6 +9,7 @@
 use Magento\Cms\Model\BlockFactory;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Stdlib\DateTime\DateTime;
+use Magento\Framework\Stdlib\DateTime\Timezone;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\TestCase;
 
@@ -81,18 +82,26 @@ public function testGetByIdentifier(array $blockData)
      */
     public function testUpdateTime(array $blockData)
     {
+
         # Prepare and save the temporary block
-        $tempBlock = $this->blockFactory->create();
+        $beforeTimestamp = $this->objectManager->get(DateTime::class)->timestamp();
+        $tempBlock       = $this->blockFactory->create();
         $tempBlock->setData($blockData);
         $this->blockResource->save($tempBlock);
 
         # Load previously created block and compare identifiers
-        $storeId = reset($blockData['stores']);
-        $block   = $this->blockIdentifier->execute($blockData['identifier'], $storeId);
-        $date    = $this->objectManager->get(DateTime::class)->date();
-        $this->markTestIncomplete('MAGETWO-87353: \Magento\Cms\Model\BlockTest::testUpdateTime randomly fails on CI. '
-            . 'Invalid assertion. Application node timestamp may significantly differ from DB node.');
-        $this->assertEquals($date, $block->getUpdateTime());
+        $storeId        = reset($blockData['stores']);
+        $block          = $this->blockIdentifier->execute($blockData['identifier'], $storeId);
+        $afterTimestamp = $this->objectManager->get(DateTime::class)->timestamp();
+        $blockTimestamp = strtotime($block->getUpdateTime());
+
+        /*
+         * This test used to fail due to a race condition @see MAGETWO-87353
+         * The DB time would be one second older than the check time. The new check allows the DB time
+         * to be between the test start time and right before the assertion.
+         */
+        $this->assertGreaterThanOrEqual($beforeTimestamp, $blockTimestamp);
+        $this->assertLessThanOrEqual($afterTimestamp, $blockTimestamp);
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/SampleData/_files/Modules/FirstModule/composer.json b/dev/tests/integration/testsuite/Magento/SampleData/_files/Modules/FirstModule/composer.json
@@ -2,7 +2,7 @@
   "name": "magento/module-first",
   "description": "N/A",
   "suggest": {
-    "magento/module-first-sample-data": "Sample Data version:777.7.*"
+    "magento/module-first-sample-data": "Sample Data version: 777.7.*"
   },
   "type": "magento2-module",
   "config": {
