🔃 [EngCom] Public Pull Requests - 2.1-develop

Stanislav Idolov · web-flow · commit 15b9b26864b9 · 2018-08-01T19:29:43.000+03:00
Accepted Public Pull Requests: - magento#17192: [Backport] Filter test result collection with the cron job code defined in the c� (by @gelanivishal) - magento#17172: Declare module namespace before template path name (by @mage2pratik) - magento#17253: [Backport] fix: change "My Dashboard" to "My Account", fixes magento#16007 (by @gelanivishal) Fixed GitHub Issues: - magento#16243: Integration test ProcessCronQueueObserverTest.php succeeds regardless of magento config fixture (reported by @evktalo) has been fixed in magento#17192 by @gelanivishal in 2.1-develop branch Related commits: 1. 1ed15d2
diff --git a/app/code/Magento/Cookie/view/frontend/web/js/notices.js b/app/code/Magento/Cookie/view/frontend/web/js/notices.js
@@ -25,7 +25,7 @@ define([
                 });
 
                 if ($.mage.cookies.get(this.options.cookieName)) {
-                    window.location.reload();
+                    this.element.hide();
                 } else {
                     window.location.href = this.options.noCookiesUrl;
                 }
diff --git a/app/code/Magento/Customer/etc/frontend/page_types.xml b/app/code/Magento/Customer/etc/frontend/page_types.xml
@@ -11,7 +11,7 @@
     <type id="customer_account_createpassword" label="Reset a Password"/>
     <type id="customer_account_edit" label="Customer Account Edit Form"/>
     <type id="customer_account_forgotpassword" label="Customer Forgot Password Form"/>
-    <type id="customer_account_index" label="Customer My Account Dashboard"/>
+    <type id="customer_account_index" label="Customer My Account"/>
     <type id="customer_account_login" label="Customer Account Login Form"/>
     <type id="customer_account_logoutsuccess" label="Customer Account Logout Success"/>
     <type id="customer_address_form" label="Customer My Account Address Edit Form"/>
diff --git a/app/code/Magento/Customer/i18n/en_US.csv b/app/code/Magento/Customer/i18n/en_US.csv
@@ -512,10 +512,8 @@ Type,Type
 "Send Welcome Email From","Send Welcome Email From"
 Addresses,Addresses
 "Are you sure you want to delete this item?","Are you sure you want to delete this item?"
-"Account Dashboard","Account Dashboard"
 "Edit Account Information","Edit Account Information"
 "Password forgotten","Password forgotten"
-"My Dashboard","My Dashboard"
 "You are signed out","You are signed out"
 "No Password","No Password"
 "Weak","Weak"
diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_account.xml b/app/code/Magento/Customer/view/frontend/layout/customer_account.xml
@@ -15,7 +15,7 @@
             <block class="Magento\Framework\View\Element\Html\Links" name="customer_account_navigation" before="-" template="Magento_Customer::account/navigation.phtml">
                 <block class="Magento\Framework\View\Element\Html\Link\Current" name="customer-account-navigation-account-link">
                     <arguments>
-                        <argument name="label" xsi:type="string" translate="true">Account Dashboard</argument>
+                        <argument name="label" xsi:type="string" translate="true">My Account</argument>
                         <argument name="path" xsi:type="string">customer/account</argument>
                     </arguments>
                 </block>
diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_account_index.xml b/app/code/Magento/Customer/view/frontend/layout/customer_account_index.xml
@@ -10,7 +10,7 @@
     <body>
         <referenceBlock name="page.main.title">
             <action method="setPageTitle">
-                <argument translate="true" name="title" xsi:type="string">My Dashboard</argument>
+                <argument translate="true" name="title" xsi:type="string">My Account</argument>
             </action>
         </referenceBlock>
         <referenceContainer name="content">
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php
@@ -206,7 +206,7 @@ public function getForm()
     }
 
     /**
-     * Return return template name for JS
+     * Return template name for JS
      *
      * @return string
      */
diff --git a/app/code/Magento/OfflinePayments/Block/Form/Banktransfer.php b/app/code/Magento/OfflinePayments/Block/Form/Banktransfer.php
@@ -15,5 +15,5 @@ class Banktransfer extends \Magento\OfflinePayments\Block\Form\AbstractInstructi
      *
      * @var string
      */
-    protected $_template = 'form/banktransfer.phtml';
+    protected $_template = 'Magento_OfflinePayments::form/banktransfer.phtml';
 }
diff --git a/app/code/Magento/OfflinePayments/Block/Form/Cashondelivery.php b/app/code/Magento/OfflinePayments/Block/Form/Cashondelivery.php
@@ -15,5 +15,5 @@ class Cashondelivery extends \Magento\OfflinePayments\Block\Form\AbstractInstruc
      *
      * @var string
      */
-    protected $_template = 'form/cashondelivery.phtml';
+    protected $_template = 'Magento_OfflinePayments::form/cashondelivery.phtml';
 }
diff --git a/app/code/Magento/Payment/Block/Info/Instructions.php b/app/code/Magento/Payment/Block/Info/Instructions.php
@@ -20,7 +20,7 @@ class Instructions extends \Magento\Payment\Block\Info
     /**
      * @var string
      */
-    protected $_template = 'info/instructions.phtml';
+    protected $_template = 'Magento_Payment::info/instructions.phtml';
 
     /**
      * Get instructions text from order payment
diff --git a/app/code/Magento/ProductAlert/Block/Email/Price.php b/app/code/Magento/ProductAlert/Block/Email/Price.php
@@ -15,7 +15,7 @@ class Price extends \Magento\ProductAlert\Block\Email\AbstractEmail
     /**
      * @var string
      */
-    protected $_template = 'email/price.phtml';
+    protected $_template = 'Magento_ProductAlert::email/price.phtml';
 
     /**
      * Retrieve unsubscribe url for product
diff --git a/app/code/Magento/ProductAlert/Block/Email/Stock.php b/app/code/Magento/ProductAlert/Block/Email/Stock.php
@@ -16,7 +16,7 @@ class Stock extends \Magento\ProductAlert\Block\Email\AbstractEmail
     /**
      * @var string
      */
-    protected $_template = 'email/stock.phtml';
+    protected $_template = 'Magento_ProductAlert::email/stock.phtml';
 
     /**
      * Retrieve unsubscribe url for product
diff --git a/app/code/Magento/Rss/Block/Feeds.php b/app/code/Magento/Rss/Block/Feeds.php
@@ -14,7 +14,7 @@ class Feeds extends \Magento\Framework\View\Element\Template
     /**
      * @var string
      */
-    protected $_template = 'feeds.phtml';
+    protected $_template = 'Magento_Rss::feeds.phtml';
 
     /**
      * @var \Magento\Framework\App\Rss\RssManagerInterface
diff --git a/app/code/Magento/Sales/Block/Order/History.php b/app/code/Magento/Sales/Block/Order/History.php
@@ -16,7 +16,7 @@ class History extends \Magento\Framework\View\Element\Template
     /**
      * @var string
      */
-    protected $_template = 'order/history.phtml';
+    protected $_template = 'Magento_Sales::order/history.phtml';
 
     /**
      * @var \Magento\Sales\Model\ResourceModel\Order\CollectionFactory
diff --git a/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging/Grid.php b/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging/Grid.php
@@ -10,7 +10,7 @@ class Grid extends \Magento\Backend\Block\Template
     /**
      * @var string
      */
-    protected $_template = 'order/packaging/grid.phtml';
+    protected $_template = 'Magento_Shipping::order/packaging/grid.phtml';
 
     /**
      * Core registry
diff --git a/app/code/Magento/Shipping/Block/Order/Shipment.php b/app/code/Magento/Shipping/Block/Order/Shipment.php
@@ -15,7 +15,7 @@ class Shipment extends \Magento\Framework\View\Element\Template
     /**
      * @var string
      */
-    protected $_template = 'order/shipment.phtml';
+    protected $_template = 'Magento_Shipping::order/shipment.phtml';
 
     /**
      * Core registry
diff --git a/app/code/Magento/UrlRewrite/Block/Catalog/Category/Tree.php b/app/code/Magento/UrlRewrite/Block/Catalog/Category/Tree.php
@@ -26,7 +26,7 @@ class Tree extends \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory
     /**
      * @var string
      */
-    protected $_template = 'categories.phtml';
+    protected $_template = 'Magento_UrlRewrite::categories.phtml';
 
     /**
      * Adminhtml data
diff --git a/app/code/Magento/UrlRewrite/Block/Selector.php b/app/code/Magento/UrlRewrite/Block/Selector.php
@@ -18,7 +18,7 @@ class Selector extends \Magento\Backend\Block\Template
     /**
      * @var string
      */
-    protected $_template = 'selector.phtml';
+    protected $_template = 'Magento_UrlRewrite::selector.phtml';
 
     /**
      * Set block template and get available modes
diff --git a/app/code/Magento/User/Block/Role/Tab/Edit.php b/app/code/Magento/User/Block/Role/Tab/Edit.php
@@ -18,7 +18,7 @@ class Edit extends \Magento\Backend\Block\Widget\Form implements \Magento\Backen
     /**
      * @var string
      */
-    protected $_template = 'role/edit.phtml';
+    protected $_template = 'Magento_User::role/edit.phtml';
 
     /**
      * Root ACL Resource
diff --git a/app/code/Magento/Weee/Block/Renderer/Weee/Tax.php b/app/code/Magento/Weee/Block/Renderer/Weee/Tax.php
@@ -33,7 +33,7 @@ class Tax extends \Magento\Backend\Block\Widget implements \Magento\Framework\Da
     /**
      * @var string
      */
-    protected $_template = 'renderer/tax.phtml';
+    protected $_template = 'Magento_Weee::renderer/tax.phtml';
 
     /**
      * Core registry
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php
@@ -25,7 +25,7 @@ class Layout extends \Magento\Backend\Block\Template implements \Magento\Framewo
     /**
      * @var string
      */
-    protected $_template = 'instance/edit/layout.phtml';
+    protected $_template = 'Magento_Widget::instance/edit/layout.phtml';
 
     /**
      * @var \Magento\Catalog\Model\Product\Type
diff --git a/app/code/Magento/Wishlist/Block/Rss/EmailLink.php b/app/code/Magento/Wishlist/Block/Rss/EmailLink.php
@@ -19,7 +19,7 @@ class EmailLink extends Link
     /**
      * @var string
      */
-    protected $_template = 'rss/email.phtml';
+    protected $_template = 'Magento_Wishlist::rss/email.phtml';
 
     /**
      * @return array
diff --git a/app/code/Magento/Wishlist/Block/Share/Email/Items.php b/app/code/Magento/Wishlist/Block/Share/Email/Items.php
@@ -16,7 +16,7 @@ class Items extends \Magento\Wishlist\Block\AbstractBlock
     /**
      * @var string
      */
-    protected $_template = 'email/items.phtml';
+    protected $_template = 'Magento_Wishlist::email/items.phtml';
 
     /**
      * Retrieve Product View URL
diff --git a/app/design/frontend/Magento/blank/i18n/en_US.csv b/app/design/frontend/Magento/blank/i18n/en_US.csv
@@ -1,5 +1,4 @@
 Summary,Summary
-"Account Dashboard","Account Dashboard"
 "Account Information","Account Information"
 "Address Book","Address Book"
 Menu,Menu
diff --git a/app/design/frontend/Magento/luma/Magento_Customer/layout/customer_account.xml b/app/design/frontend/Magento/luma/Magento_Customer/layout/customer_account.xml
@@ -10,7 +10,7 @@
         <referenceContainer name="sidebar.main">
             <block class="Magento\Framework\View\Element\Template" name="customer_account_navigation_block" template="Magento_Theme::html/collapsible.phtml" before="-">
                 <arguments>
-                    <argument name="block_title" translate="true" xsi:type="string">Account Dashboard</argument>
+                    <argument name="block_title" translate="true" xsi:type="string">My Account</argument>
                     <argument name="block_css" xsi:type="string">block-collapsible-nav</argument>
                 </arguments>
                 <block class="Magento\Framework\View\Element\Html\Links" name="customer_account_navigation" before="-">
@@ -19,7 +19,7 @@
                     </arguments>
                     <block class="Magento\Framework\View\Element\Html\Link\Current" name="customer-account-navigation-account-link">
                         <arguments>
-                            <argument name="label" xsi:type="string" translate="true">Account Dashboard</argument>
+                            <argument name="label" xsi:type="string" translate="true">My Account</argument>
                             <argument name="path" xsi:type="string">customer/account</argument>
                         </arguments>
                     </block>
diff --git a/app/design/frontend/Magento/luma/i18n/en_US.csv b/app/design/frontend/Magento/luma/i18n/en_US.csv
@@ -42,3 +42,6 @@ Password:,Password:
 "Placed on <span class=""no-link"">%created_at</span>","Placed on <span class=""no-link"">%created_at</span>"
 "Your shipping confirmation is below. Thank you again for your business.","Your shipping confirmation is below. Thank you again for your business."
 "Your Shipment #%shipment_id for Order #%order_id","Your Shipment #%shipment_id for Order #%order_id"
+"Update to your %store_name shipment","Update to your %store_name shipment"
+"Address Book","Address Book"
+"Account Information","Account Information"
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerDefaultAddresses.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerDefaultAddresses.php
@@ -24,7 +24,7 @@ class AssertCustomerDefaultAddresses extends AbstractConstraint
      */
     public function processAssert(CustomerAccountIndex $customerAccountIndex, Address $address)
     {
-        $customerAccountIndex->getAccountMenuBlock()->openMenuItem('Account Dashboard');
+        $customerAccountIndex->getAccountMenuBlock()->openMenuItem('My Account');
         sleep(6);
         $defaultBillingAddress = explode(
             "\n",
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerRedirectToDashboard.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerRedirectToDashboard.php
@@ -17,7 +17,7 @@ class AssertCustomerRedirectToDashboard extends AbstractConstraint
     /**
      * Dashboard Message on account index page.
      */
-    const DASHBOARD_MESSAGE = 'My Dashboard';
+    const DASHBOARD_MESSAGE = 'My Account';
 
     /**
      * Constraint severeness
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/LogoutCustomerOnFrontendStep.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/LogoutCustomerOnFrontendStep.php
@@ -49,7 +49,7 @@ public function run()
     {
         $this->customerAccount->open();
         $this->cmsIndex->getCmsPageBlock()->waitPageInit();
-        if ($this->cmsIndex->getTitleBlock()->getTitle() != 'Customer Login') {
+        if ($this->cmsIndex->getTitleBlock()->getTitle() === 'My Account') {
             $this->cmsIndex->getLinksBlock()->openLink('Sign Out');
             $this->cmsIndex->getCmsPageBlock()->waitUntilTextIsVisible('Home Page');
             $this->cmsIndex->getCmsPageBlock()->waitPageInit();
diff --git a/dev/tests/integration/testsuite/Magento/Cron/Observer/ProcessCronQueueObserverTest.php b/dev/tests/integration/testsuite/Magento/Cron/Observer/ProcessCronQueueObserverTest.php
@@ -27,14 +27,15 @@ protected function setUp()
     }
 
     /**
-     * @magentoConfigFixture current_store crontab/default/jobs/catalog_product_alert/schedule/cron_expr 8 * * * *
+     * @magentoConfigFixture current_store crontab/default/jobs/catalog_product_alert/schedule/cron_expr * * * * *
      */
     public function testDispatchScheduled()
     {
         $collection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
             'Magento\Cron\Model\ResourceModel\Schedule\Collection'
         );
         $collection->addFieldToFilter('status', \Magento\Cron\Model\Schedule::STATUS_PENDING);
+        $collection->addFieldToFilter('job_code', 'catalog_product_alert');
         $this->assertGreaterThan(0, $collection->count(), 'Cron has failed to schedule tasks for itself for future.');
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/group.xml b/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/group.xml
@@ -9,17 +9,17 @@
     <block class="Magento\Framework\View\Element\Text" name="block1">
         <block class="Magento\Framework\View\Element\Text" name="block2" group="group1">
             <arguments>
-                <argument xsi:type="string" name="text">blok2</argument>
+                <argument xsi:type="string" name="text">block2</argument>
             </arguments>
         </block>
         <block class="Magento\Framework\View\Element\Text" name="block3" group="group1" >
             <arguments>
-                <argument xsi:type="string" name="text">blok3</argument>
+                <argument xsi:type="string" name="text">block3</argument>
             </arguments>
         </block>
         <block class="Magento\Framework\View\Element\Text" name="block4">
             <arguments>
-                <argument xsi:type="string" name="text">blok4</argument>
+                <argument xsi:type="string" name="text">block4</argument>
             </arguments>
         </block>
         </block>

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ define([`
`25`	`25`	`});`
`26`	`26`
`27`	`27`	`if ($.mage.cookies.get(this.options.cookieName)) {`
`28`		`- window.location.reload();`
	`28`	`+ this.element.hide();`
`29`	`29`	`} else {`
`30`	`30`	`window.location.href = this.options.noCookiesUrl;`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@ public function getForm()`
`206`	`206`	`}`
`207`	`207`
`208`	`208`	`/**`
`209`		`- * Return return template name for JS`
	`209`	`+ * Return template name for JS`
`210`	`210`	`*`
`211`	`211`	`* @return string`
`212`	`212`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -15,5 +15,5 @@ class Banktransfer extends \Magento\OfflinePayments\Block\Form\AbstractInstructi`
`15`	`15`	`*`
`16`	`16`	`* @var string`
`17`	`17`	`*/`
`18`		`- protected $_template = 'form/banktransfer.phtml';`
	`18`	`+ protected $_template = 'Magento_OfflinePayments::form/banktransfer.phtml';`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,5 +15,5 @@ class Cashondelivery extends \Magento\OfflinePayments\Block\Form\AbstractInstruc`
`15`	`15`	`*`
`16`	`16`	`* @var string`
`17`	`17`	`*/`
`18`		`- protected $_template = 'form/cashondelivery.phtml';`
	`18`	`+ protected $_template = 'Magento_OfflinePayments::form/cashondelivery.phtml';`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`Summary,Summary`
`2`		`-"Account Dashboard","Account Dashboard"`
`3`	`2`	`"Account Information","Account Information"`
`4`	`3`	`"Address Book","Address Book"`
`5`	`4`	`Menu,Menu`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class AssertCustomerDefaultAddresses extends AbstractConstraint`
`24`	`24`	`*/`
`25`	`25`	`public function processAssert(CustomerAccountIndex $customerAccountIndex, Address $address)`
`26`	`26`	`{`
`27`		`- $customerAccountIndex->getAccountMenuBlock()->openMenuItem('Account Dashboard');`
	`27`	`+ $customerAccountIndex->getAccountMenuBlock()->openMenuItem('My Account');`
`28`	`28`	`sleep(6);`
`29`	`29`	`$defaultBillingAddress = explode(`
`30`	`30`	`"\n",`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public function run()`
`49`	`49`	`{`
`50`	`50`	`$this->customerAccount->open();`
`51`	`51`	`$this->cmsIndex->getCmsPageBlock()->waitPageInit();`
`52`		`- if ($this->cmsIndex->getTitleBlock()->getTitle() != 'Customer Login') {`
	`52`	`+ if ($this->cmsIndex->getTitleBlock()->getTitle() === 'My Account') {`
`53`	`53`	`$this->cmsIndex->getLinksBlock()->openLink('Sign Out');`
`54`	`54`	`$this->cmsIndex->getCmsPageBlock()->waitUntilTextIsVisible('Home Page');`
`55`	`55`	`$this->cmsIndex->getCmsPageBlock()->waitPageInit();`
Original file line number	Diff line number	Diff line change
`@@ -27,14 +27,15 @@ protected function setUp()`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`/**`
`30`		`- * @magentoConfigFixture current_store crontab/default/jobs/catalog_product_alert/schedule/cron_expr 8 * * * *`
	`30`	`+ * @magentoConfigFixture current_store crontab/default/jobs/catalog_product_alert/schedule/cron_expr * * * * *`
`31`	`31`	`*/`
`32`	`32`	`public function testDispatchScheduled()`
`33`	`33`	`{`
`34`	`34`	`$collection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(`
`35`	`35`	`'Magento\Cron\Model\ResourceModel\Schedule\Collection'`
`36`	`36`	`);`
`37`	`37`	`$collection->addFieldToFilter('status', \Magento\Cron\Model\Schedule::STATUS_PENDING);`
	`38`	`+ $collection->addFieldToFilter('job_code', 'catalog_product_alert');`
`38`	`39`	`$this->assertGreaterThan(0, $collection->count(), 'Cron has failed to schedule tasks for itself for future.');`
`39`	`40`	`}`
`40`	`41`