diff --git a/app/code/Magento/Captcha/view/frontend/layout/checkout_onepage_index.xml b/app/code/Magento/Captcha/view/frontend/layout/checkout_index_index.xml
similarity index 100%
rename from app/code/Magento/Captcha/view/frontend/layout/checkout_onepage_index.xml
rename to app/code/Magento/Captcha/view/frontend/layout/checkout_index_index.xml
diff --git a/app/code/Magento/Checkout/Block/Cart.php b/app/code/Magento/Checkout/Block/Cart.php
index f2a8c2fda5df15e3099520ef593bdea6a4a1c5ee..4a788f5725a1a7516f662d351674d943dae4f20f 100644
--- a/app/code/Magento/Checkout/Block/Cart.php
+++ b/app/code/Magento/Checkout/Block/Cart.php
@@ -144,7 +144,7 @@ class Cart extends \Magento\Checkout\Block\Cart\AbstractCart
*/
public function getCheckoutUrl()
{
- return $this->getUrl('checkout/onepage', ['_secure' => true]);
+ return $this->getUrl('checkout', ['_secure' => true]);
}
/**
diff --git a/app/code/Magento/Checkout/Block/Cart/Sidebar.php b/app/code/Magento/Checkout/Block/Cart/Sidebar.php
index a754a3c6582c58f3a1dcd4ec8f90f234a2ffaeff..73446f90f7b0152fe43c0313f90a26bbcc465ec6 100644
--- a/app/code/Magento/Checkout/Block/Cart/Sidebar.php
+++ b/app/code/Magento/Checkout/Block/Cart/Sidebar.php
@@ -88,7 +88,7 @@ class Sidebar extends AbstractCart
*/
public function getCheckoutUrl()
{
- return $this->getUrl('checkout/onepage');
+ return $this->getUrl('checkout');
}
/**
diff --git a/app/code/Magento/Checkout/Block/Onepage/Link.php b/app/code/Magento/Checkout/Block/Onepage/Link.php
index b6b6c0f841e7efd10f9396e936af8416957b5f98..6274b03cd942a684aff9439989d198b2fd2b4d05 100644
--- a/app/code/Magento/Checkout/Block/Onepage/Link.php
+++ b/app/code/Magento/Checkout/Block/Onepage/Link.php
@@ -45,7 +45,7 @@ class Link extends \Magento\Framework\View\Element\Template
*/
public function getCheckoutUrl()
{
- return $this->getUrl('checkout/onepage');
+ return $this->getUrl('checkout');
}
/**
diff --git a/app/code/Magento/Checkout/Controller/Onepage/Index.php b/app/code/Magento/Checkout/Controller/Index/Index.php
similarity index 97%
rename from app/code/Magento/Checkout/Controller/Onepage/Index.php
rename to app/code/Magento/Checkout/Controller/Index/Index.php
index 7fa9fa794c5fb5ab4441324cc716e26bec15c987..518ae5e30eba92474f64ef5c3561dbd43b375a98 100644
--- a/app/code/Magento/Checkout/Controller/Onepage/Index.php
+++ b/app/code/Magento/Checkout/Controller/Index/Index.php
@@ -4,7 +4,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Checkout\Controller\Onepage;
+namespace Magento\Checkout\Controller\Index;
class Index extends \Magento\Checkout\Controller\Onepage
{
diff --git a/app/code/Magento/Checkout/Test/Unit/Controller/Onepage/IndexTest.php b/app/code/Magento/Checkout/Test/Unit/Controller/Index/IndexTest.php
similarity index 97%
rename from app/code/Magento/Checkout/Test/Unit/Controller/Onepage/IndexTest.php
rename to app/code/Magento/Checkout/Test/Unit/Controller/Index/IndexTest.php
index 5159d70026cbc5c902e6adc3c3b80d21e22ea64e..c0f13dc40942fb901ec9722a0d1da841398463f4 100644
--- a/app/code/Magento/Checkout/Test/Unit/Controller/Onepage/IndexTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Controller/Index/IndexTest.php
@@ -1,12 +1,12 @@
<?php
/**
- * Test for \Magento\Checkout\Controller\Onepage\Index
+ * Test for \Magento\Checkout\Controller\Index\Index
*
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Checkout\Test\Unit\Controller\Onepage;
+namespace Magento\Checkout\Test\Unit\Controller\Index;
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManager;
@@ -71,7 +71,7 @@ class IndexTest extends \PHPUnit_Framework_TestCase
private $redirectMock;
/**
- * @var \Magento\Checkout\Controller\Onepage\Index
+ * @var \Magento\Checkout\Controller\Index\Index
*/
private $model;
@@ -171,7 +171,7 @@ class IndexTest extends \PHPUnit_Framework_TestCase
// SUT
$this->model = $this->objectManager->getObject(
- 'Magento\Checkout\Controller\Onepage\Index',
+ 'Magento\Checkout\Controller\Index\Index',
[
'context' => $this->contextMock,
'customerSession' => $this->sessionMock,
diff --git a/app/code/Magento/Checkout/etc/frontend/di.xml b/app/code/Magento/Checkout/etc/frontend/di.xml
index 20f146cc353ce63add45e00f3fc083c28cdb2768..7afa91b1a8bbdebc03e2000313237bdbea622b34 100644
--- a/app/code/Magento/Checkout/etc/frontend/di.xml
+++ b/app/code/Magento/Checkout/etc/frontend/di.xml
@@ -10,7 +10,7 @@
<type name="Magento\Framework\Url\SecurityInfo">
<arguments>
<argument name="secureUrlList" xsi:type="array">
- <item name="checkout_onepage" xsi:type="string">/checkout/onepage</item>
+ <item name="checkout_index" xsi:type="string">/checkout</item>
</argument>
</arguments>
</type>
diff --git a/app/code/Magento/Checkout/etc/frontend/page_types.xml b/app/code/Magento/Checkout/etc/frontend/page_types.xml
index dc770ab1d1bb794e1de7d404ce9ea6a132badb4f..88d2dc95d584c0b24057cb04835c42bb980e5055 100644
--- a/app/code/Magento/Checkout/etc/frontend/page_types.xml
+++ b/app/code/Magento/Checkout/etc/frontend/page_types.xml
@@ -9,7 +9,7 @@
<type id="checkout_cart_configure" label="Configure Cart Item (Any)"/>
<type id="checkout_cart_index" label="Shopping Cart"/>
<type id="checkout_onepage_failure" label="One Page Checkout Failure"/>
- <type id="checkout_onepage_index" label="One Page Checkout"/>
+ <type id="checkout_index_index" label="One Page Checkout"/>
<type id="checkout_onepage_paymentmethod" label="One Page Checkout Choose Payment Method"/>
<type id="checkout_onepage_review" label="One Page Checkout Overview"/>
<type id="checkout_onepage_shippingmethod" label="One Page Checkout Choose Shipping Method"/>
diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_index.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_index_index.xml
similarity index 100%
rename from app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_index.xml
rename to app/code/Magento/Checkout/view/frontend/layout/checkout_index_index.xml
diff --git a/app/code/Magento/CheckoutAgreements/view/frontend/layout/checkout_onepage_original.xml b/app/code/Magento/CheckoutAgreements/view/frontend/layout/checkout_onepage_original.xml
deleted file mode 100644
index 89eb6278a7646836ff461eb6955899faae9b5fb9..0000000000000000000000000000000000000000
--- a/app/code/Magento/CheckoutAgreements/view/frontend/layout/checkout_onepage_original.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright © 2015 Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<!-- TODO remove this file as soon as enhanced checkout is implemented -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="1column" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
- <body>
- <referenceBlock name="checkout.root">
- <arguments>
- <argument name="jsLayout" xsi:type="array">
- <item name="components" xsi:type="array">
- <item name="checkout" xsi:type="array">
- <item name="children" xsi:type="array">
- <item name="steps" xsi:type="array">
- <item name="children" xsi:type="array">
- <item name="review" xsi:type="array">
- <item name="children" xsi:type="array">
- <item name="beforePlaceOrder" xsi:type="array">
- <item name="children" xsi:type="array">
- <item name="checkoutAgreements" xsi:type="array">
- <item name="component" xsi:type="string">Magento_CheckoutAgreements/js/view/checkoutAgreements</item>
- <item name="dataScope" xsi:type="string">checkoutAgreements</item>
- <item name="displayArea" xsi:type="string">checkoutAgreements</item>
- <item name="provider" xsi:type="string">checkoutProvider</item>
- <item name="children" xsi:type="array">
- </item>
- </item>
- </item>
- </item>
- </item>
- </item>
- </item>
- </item>
- </item>
- </item>
- </item>
- </argument>
- </arguments>
- </referenceBlock>
- </body>
-</page>
diff --git a/app/code/Magento/Dhl/view/frontend/layout/checkout_onepage_index.xml b/app/code/Magento/Dhl/view/frontend/layout/checkout_index_index.xml
similarity index 100%
rename from app/code/Magento/Dhl/view/frontend/layout/checkout_onepage_index.xml
rename to app/code/Magento/Dhl/view/frontend/layout/checkout_index_index.xml
diff --git a/app/code/Magento/Fedex/view/frontend/layout/checkout_onepage_index.xml b/app/code/Magento/Fedex/view/frontend/layout/checkout_index_index.xml
similarity index 100%
rename from app/code/Magento/Fedex/view/frontend/layout/checkout_onepage_index.xml
rename to app/code/Magento/Fedex/view/frontend/layout/checkout_index_index.xml
diff --git a/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/PluginTest.php b/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/PluginTest.php
index ac15a45ececeab8a6caa7d464e633ed7d41414c8..9cfb6a0c75f553e05f6710099bed558608eb02d3 100644
--- a/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/PluginTest.php
+++ b/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/PluginTest.php
@@ -41,7 +41,7 @@ class PluginTest extends \PHPUnit_Framework_TestCase
public function testExecuteTurnsOffMultishippingModeOnQuote()
{
- $subject = $this->getMock('Magento\Checkout\Controller\Onepage\Index', [], [], '', false);
+ $subject = $this->getMock('Magento\Checkout\Controller\Index\Index', [], [], '', false);
$this->quoteMock->expects($this->once())->method('setIsMultiShipping')->with(0);
$this->object->beforeExecute($subject);
}
diff --git a/app/code/Magento/Multishipping/etc/frontend/di.xml b/app/code/Magento/Multishipping/etc/frontend/di.xml
index 0320b5cc341c4b6bd030ae4afffdb2248c00cb1e..61d72838f9ee3b28d606a80928262098d4c351b7 100644
--- a/app/code/Magento/Multishipping/etc/frontend/di.xml
+++ b/app/code/Magento/Multishipping/etc/frontend/di.xml
@@ -36,7 +36,7 @@
<type name="Magento\Checkout\Controller\Cart\UpdatePost">
<plugin name="multishipping_disabler" type="Magento\Multishipping\Controller\Checkout\Plugin" sortOrder="50" />
</type>
- <type name="Magento\Checkout\Controller\Onepage\Index">
+ <type name="Magento\Checkout\Controller\Index\Index">
<plugin name="multishipping_disabler" type="Magento\Multishipping\Controller\Checkout\Plugin" sortOrder="50" />
</type>
<type name="Magento\Checkout\Model\Cart">
diff --git a/app/code/Magento/OfflinePayments/view/frontend/layout/checkout_onepage_index.xml b/app/code/Magento/OfflinePayments/view/frontend/layout/checkout_index_index.xml
similarity index 100%
rename from app/code/Magento/OfflinePayments/view/frontend/layout/checkout_onepage_index.xml
rename to app/code/Magento/OfflinePayments/view/frontend/layout/checkout_index_index.xml
diff --git a/app/code/Magento/OfflineShipping/view/frontend/layout/checkout_onepage_index.xml b/app/code/Magento/OfflineShipping/view/frontend/layout/checkout_index_index.xml
similarity index 100%
rename from app/code/Magento/OfflineShipping/view/frontend/layout/checkout_onepage_index.xml
rename to app/code/Magento/OfflineShipping/view/frontend/layout/checkout_index_index.xml
diff --git a/app/code/Magento/Persistent/view/frontend/layout/checkout_onepage_original.xml b/app/code/Magento/Persistent/view/frontend/layout/checkout_onepage_original.xml
deleted file mode 100644
index 6d8cd9506b3907770cbb9e49e44996503a4337bd..0000000000000000000000000000000000000000
--- a/app/code/Magento/Persistent/view/frontend/layout/checkout_onepage_original.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright © 2015 Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<!-- TODO remove this file as soon as enhanced checkout is implemented -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="1column" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
- <body>
- <referenceBlock name="checkout.root">
- <arguments>
- <argument name="jsLayout" xsi:type="array">
- <item name="components" xsi:type="array">
- <item name="checkout" xsi:type="array">
- <item name="children" xsi:type="array">
- <item name="steps" xsi:type="array">
- <item name="children" xsi:type="array">
- <item name="authentication" xsi:type="array">
- <item name="children" xsi:type="array">
- <item name="remember-me" xsi:type="array">
- <item name="component" xsi:type="string">Magento_Persistent/js/view/remember-me</item>
- <item name="displayArea" xsi:type="string">additional-login-form-fields</item>
- </item>
- </item>
- </item>
- <item name="billingAddress" xsi:type="array">
- <item name="children" xsi:type="array">
- <item name="remember-me" xsi:type="array">
- <item name="component" xsi:type="string">Magento_Persistent/js/view/remember-me</item>
- <item name="dataScope" xsi:type="string">additionalAddressData</item>
- <item name="displayArea" xsi:type="string">additional-fieldsets</item>
- </item>
- </item>
- </item>
- </item>
- </item>
- </item>
- </item>
- </item>
- </argument>
- </arguments>
- </referenceBlock>
- </body>
-</page>
diff --git a/app/code/Magento/Sales/view/frontend/layout/checkout_onepage_index.xml b/app/code/Magento/Sales/view/frontend/layout/checkout_index_index.xml
similarity index 100%
rename from app/code/Magento/Sales/view/frontend/layout/checkout_onepage_index.xml
rename to app/code/Magento/Sales/view/frontend/layout/checkout_index_index.xml
diff --git a/app/code/Magento/Shipping/view/frontend/layout/checkout_onepage_index.xml b/app/code/Magento/Shipping/view/frontend/layout/checkout_index_index.xml
similarity index 100%
rename from app/code/Magento/Shipping/view/frontend/layout/checkout_onepage_index.xml
rename to app/code/Magento/Shipping/view/frontend/layout/checkout_index_index.xml
diff --git a/app/code/Magento/Tax/view/frontend/layout/checkout_onepage_index.xml b/app/code/Magento/Tax/view/frontend/layout/checkout_index_index.xml
similarity index 100%
rename from app/code/Magento/Tax/view/frontend/layout/checkout_onepage_index.xml
rename to app/code/Magento/Tax/view/frontend/layout/checkout_index_index.xml
diff --git a/app/code/Magento/Ups/view/frontend/layout/checkout_onepage_index.xml b/app/code/Magento/Ups/view/frontend/layout/checkout_index_index.xml
similarity index 100%
rename from app/code/Magento/Ups/view/frontend/layout/checkout_onepage_index.xml
rename to app/code/Magento/Ups/view/frontend/layout/checkout_index_index.xml
diff --git a/app/code/Magento/Usps/view/frontend/layout/checkout_onepage_index.xml b/app/code/Magento/Usps/view/frontend/layout/checkout_index_index.xml
similarity index 100%
rename from app/code/Magento/Usps/view/frontend/layout/checkout_onepage_index.xml
rename to app/code/Magento/Usps/view/frontend/layout/checkout_index_index.xml
diff --git a/app/code/Magento/Weee/view/frontend/layout/checkout_onepage_index.xml b/app/code/Magento/Weee/view/frontend/layout/checkout_index_index.xml
similarity index 100%
rename from app/code/Magento/Weee/view/frontend/layout/checkout_onepage_index.xml
rename to app/code/Magento/Weee/view/frontend/layout/checkout_index_index.xml
diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/layout/checkout_onepage_index.xml b/app/design/frontend/Magento/blank/Magento_Checkout/layout/checkout_index_index.xml
similarity index 100%
rename from app/design/frontend/Magento/blank/Magento_Checkout/layout/checkout_onepage_index.xml
rename to app/design/frontend/Magento/blank/Magento_Checkout/layout/checkout_index_index.xml
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Page/CheckoutOnepage.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/Page/CheckoutOnepage.xml
index 253de1616fe69d4483674100af98bce7b60b7dc0..5f5d95e511ddf4129135cac084abb17d546c018b 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Page/CheckoutOnepage.xml
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Page/CheckoutOnepage.xml
@@ -6,7 +6,7 @@
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/pages.xsd">
- <page name="CheckoutOnepage" mca="checkout/onepage" module="Magento_Checkout">
+ <page name="CheckoutOnepage" mca="checkout/index" module="Magento_Checkout">
<block name="loginBlock" class="Magento\Checkout\Test\Block\Onepage\Login" locator="#checkout-step-authentication" strategy="css selector"/>
<block name="billingBlock" class="Magento\Checkout\Test\Block\Onepage\Billing" locator="#checkout-step-billing" strategy="css selector"/>
<block name="shippingBlock" class="Magento\Checkout\Test\Block\Onepage\Shipping" locator="#checkout-step-shipping" strategy="css selector"/>
diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Page/CheckoutOnepage.xml b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Page/CheckoutOnepage.xml
index e083ee46d7f673bea8595d09650a7081fcaa2d20..db078d6fe33320be59c41868d4036f795be70fa1 100644
--- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Page/CheckoutOnepage.xml
+++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Page/CheckoutOnepage.xml
@@ -6,7 +6,7 @@
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/pages.xsd">
- <page name="CheckoutOnepage" mca="checkout/onepage" module="Magento_Checkout">
+ <page name="CheckoutOnepage" mca="checkout/index" module="Magento_Checkout">
<block name="agreementReview" class="Magento\CheckoutAgreements\Test\Block\Onepage\AgreementReview" locator="#checkout-step-review" strategy="css selector"/>
</page>
</config>
diff --git a/dev/tests/performance/benchmark.jmx b/dev/tests/performance/benchmark.jmx
index 92ac0e689898c76a1dd489ec125330ad1f4d3c61..e1c9c005646cd2224210e5c0aea7312b4173f0d3 100644
--- a/dev/tests/performance/benchmark.jmx
+++ b/dev/tests/performance/benchmark.jmx
@@ -765,7 +765,7 @@
<stringProp name="HTTPSampler.response_timeout"></stringProp>
<stringProp name="HTTPSampler.protocol"></stringProp>
<stringProp name="HTTPSampler.contentEncoding"></stringProp>
- <stringProp name="HTTPSampler.path">${base_path}checkout/onepage/</stringProp>
+ <stringProp name="HTTPSampler.path">${base_path}checkout/index/</stringProp>
<stringProp name="HTTPSampler.method">GET</stringProp>
<boolProp name="HTTPSampler.follow_redirects">true</boolProp>
<boolProp name="HTTPSampler.auto_redirects">false</boolProp>
@@ -926,7 +926,7 @@
<collectionProp name="HeaderManager.headers">
<elementProp name="" elementType="Header">
<stringProp name="Header.name">Referer</stringProp>
- <stringProp name="Header.value">http://mage2.com/checkout/onepage/</stringProp>
+ <stringProp name="Header.value">http://mage2.com/checkout/index/</stringProp>
</elementProp>
<elementProp name="Content-Type" elementType="Header">
<stringProp name="Header.name">Content-Type</stringProp>
@@ -992,7 +992,7 @@
<collectionProp name="HeaderManager.headers">
<elementProp name="" elementType="Header">
<stringProp name="Header.name">Referer</stringProp>
- <stringProp name="Header.value">http://mage2.com/checkout/onepage/</stringProp>
+ <stringProp name="Header.value">http://mage2.com/checkout/index/</stringProp>
</elementProp>
<elementProp name="" elementType="Header">
<stringProp name="Header.name">Content-Type</stringProp>
diff --git a/dev/tests/performance/testsuite/checkout.jmx b/dev/tests/performance/testsuite/checkout.jmx
index 6306e47f71ab4d71d780ea77e958cfea918d27c8..f69598bbb50bfbc9558ddeea9f63ce5eb406cea1 100644
--- a/dev/tests/performance/testsuite/checkout.jmx
+++ b/dev/tests/performance/testsuite/checkout.jmx
@@ -296,7 +296,7 @@
<stringProp name="HTTPSampler.response_timeout"></stringProp>
<stringProp name="HTTPSampler.protocol"></stringProp>
<stringProp name="HTTPSampler.contentEncoding"></stringProp>
- <stringProp name="HTTPSampler.path">${PATH}checkout/onepage/</stringProp>
+ <stringProp name="HTTPSampler.path">${PATH}checkout/index/</stringProp>
<stringProp name="HTTPSampler.method">GET</stringProp>
<boolProp name="HTTPSampler.follow_redirects">true</boolProp>
<boolProp name="HTTPSampler.auto_redirects">false</boolProp>
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Model/Layout/MergeTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Model/Layout/MergeTest.php
index 281bb8ac0519d7f345fbe8d264cb0834a9ca4f40..119fd12fdfc488f09e63d09098ecd16ced7d9dee 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Model/Layout/MergeTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Model/Layout/MergeTest.php
@@ -191,11 +191,11 @@ class MergeTest extends \PHPUnit_Framework_TestCase
$this->assertEquals(array_merge($nonPageHandles, $expectedPageHandles), $this->_model->getHandles());
/* test that new handles override the previous ones */
- $expectedPageHandles = ['default', 'checkout_onepage_index'];
+ $expectedPageHandles = ['default', 'checkout_index_index'];
$this->_model->removeHandle('catalog_category_default');
$this->_model->removeHandle('catalog_product_view');
$this->_model->removeHandle('catalog_product_view_type_simple');
- $this->assertTrue($this->_model->addPageHandles(['default', 'checkout_onepage_index']));
+ $this->assertTrue($this->_model->addPageHandles(['default', 'checkout_index_index']));
$this->assertEquals($expectedPageHandles, $this->_model->getPageHandles());
$this->assertEquals(array_merge($nonPageHandles, $expectedPageHandles), $this->_model->getHandles());
}
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Model/Layout/_files/layout/checkout_onepage_index.xml b/lib/internal/Magento/Framework/View/Test/Unit/Model/Layout/_files/layout/checkout_index_index.xml
similarity index 100%
rename from lib/internal/Magento/Framework/View/Test/Unit/Model/Layout/_files/layout/checkout_onepage_index.xml
rename to lib/internal/Magento/Framework/View/Test/Unit/Model/Layout/_files/layout/checkout_index_index.xml
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Model/Layout/_files/merged.xml b/lib/internal/Magento/Framework/View/Test/Unit/Model/Layout/_files/merged.xml
index 8553d5f68dbdf5a0378c67f0df53b54b865877c7..bcee531b78f53be68e80706853bd826571fe143b 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Model/Layout/_files/merged.xml
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Model/Layout/_files/merged.xml
@@ -21,7 +21,7 @@
</body>
</handle>
<handle id="catalog_product_view_type_simple"/>
- <handle id="checkout_onepage_index"/>
+ <handle id="checkout_index_index"/>
<handle id="customer_account" label="Customer My Account (All Pages)" design_abstraction="custom"/>
<handle id="default">
<body>
diff --git a/setup/performance-toolkit/benchmark.jmx b/setup/performance-toolkit/benchmark.jmx
index 21a247514cb106d408b9305951dff3f39742d3d0..b5c7b55cac60a29745da1ec3771e16ab23bbe2d9 100644
--- a/setup/performance-toolkit/benchmark.jmx
+++ b/setup/performance-toolkit/benchmark.jmx
@@ -2321,7 +2321,7 @@ vars.put("category_name", props.get("category_name"));</stri
<stringProp name="HTTPSampler.response_timeout"></stringProp>
<stringProp name="HTTPSampler.protocol">http</stringProp>
<stringProp name="HTTPSampler.contentEncoding"></stringProp>
- <stringProp name="HTTPSampler.path">${base_path}checkout/onepage/</stringProp>
+ <stringProp name="HTTPSampler.path">${base_path}checkout/index/</stringProp>
<stringProp name="HTTPSampler.method">GET</stringProp>
<boolProp name="HTTPSampler.follow_redirects">true</boolProp>
<boolProp name="HTTPSampler.auto_redirects">false</boolProp>
@@ -2432,7 +2432,7 @@ vars.put("category_name", props.get("category_name"));</stri
<collectionProp name="HeaderManager.headers">
<elementProp name="" elementType="Header">
<stringProp name="Header.name">Referer</stringProp>
- <stringProp name="Header.value">http://mage2.com/checkout/onepage/</stringProp>
+ <stringProp name="Header.value">http://mage2.com/checkout/index/</stringProp>
</elementProp>
<elementProp name="Content-Type" elementType="Header">
<stringProp name="Header.name">Content-Type</stringProp>
@@ -2497,7 +2497,7 @@ vars.put("category_name", props.get("category_name"));</stri
<collectionProp name="HeaderManager.headers">
<elementProp name="" elementType="Header">
<stringProp name="Header.name">Referer</stringProp>
- <stringProp name="Header.value">http://mage2.com/checkout/onepage/</stringProp>
+ <stringProp name="Header.value">http://mage2.com/checkout/index/</stringProp>
</elementProp>
<elementProp name="" elementType="Header">
<stringProp name="Header.name">Content-Type</stringProp>
@@ -2560,7 +2560,7 @@ vars.put("category_name", props.get("category_name"));</stri
<collectionProp name="HeaderManager.headers">
<elementProp name="" elementType="Header">
<stringProp name="Header.name">Referer</stringProp>
- <stringProp name="Header.value">http://mage2.com/checkout/onepage/</stringProp>
+ <stringProp name="Header.value">http://mage2.com/checkout/index/</stringProp>
</elementProp>
<elementProp name="" elementType="Header">
<stringProp name="Header.name">Content-Type</stringProp>
@@ -3196,7 +3196,7 @@ if (emailsCount < 1) {
<stringProp name="HTTPSampler.response_timeout"></stringProp>
<stringProp name="HTTPSampler.protocol">http</stringProp>
<stringProp name="HTTPSampler.contentEncoding"></stringProp>
- <stringProp name="HTTPSampler.path">${base_path}checkout/onepage/</stringProp>
+ <stringProp name="HTTPSampler.path">${base_path}checkout/index/</stringProp>
<stringProp name="HTTPSampler.method">GET</stringProp>
<boolProp name="HTTPSampler.follow_redirects">true</boolProp>
<boolProp name="HTTPSampler.auto_redirects">false</boolProp>
@@ -3361,7 +3361,7 @@ if (emailsCount < 1) {
<collectionProp name="HeaderManager.headers">
<elementProp name="" elementType="Header">
<stringProp name="Header.name">Referer</stringProp>
- <stringProp name="Header.value">http://mage2.com/checkout/onepage/</stringProp>
+ <stringProp name="Header.value">http://mage2.com/checkout/index/</stringProp>
</elementProp>
<elementProp name="Content-Type" elementType="Header">
<stringProp name="Header.name">Content-Type</stringProp>
@@ -3426,7 +3426,7 @@ if (emailsCount < 1) {
<collectionProp name="HeaderManager.headers">
<elementProp name="" elementType="Header">
<stringProp name="Header.name">Referer</stringProp>
- <stringProp name="Header.value">http://mage2.com/checkout/onepage/</stringProp>
+ <stringProp name="Header.value">http://mage2.com/checkout/index/</stringProp>
</elementProp>
<elementProp name="" elementType="Header">
<stringProp name="Header.name">Content-Type</stringProp>
@@ -3489,7 +3489,7 @@ if (emailsCount < 1) {
<collectionProp name="HeaderManager.headers">
<elementProp name="" elementType="Header">
<stringProp name="Header.name">Referer</stringProp>
- <stringProp name="Header.value">http://mage2.com/checkout/onepage/</stringProp>
+ <stringProp name="Header.value">http://mage2.com/checkout/index/</stringProp>
</elementProp>
<elementProp name="" elementType="Header">
<stringProp name="Header.name">Content-Type</stringProp>