Skip to content

Commit 88b6e0e

Browse files
author
Viktor Kopin
committed
MFTF test coverage, fix static
1 parent cd448f5 commit 88b6e0e

File tree

5 files changed

+25
-4
lines changed

5 files changed

+25
-4
lines changed

app/code/Magento/Multishipping/Block/Checkout/State.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@
44
* See COPYING.txt for license details.
55
*/
66

7+
namespace Magento\Multishipping\Block\Checkout;
8+
79
/**
810
* Multishipping checkout state
911
*
12+
* @api
1013
* @author Magento Core Team <[email protected]>
1114
*/
12-
namespace Magento\Multishipping\Block\Checkout;
13-
1415
class State extends \Magento\Framework\View\Element\Template
1516
{
1617
/**
@@ -33,6 +34,8 @@ public function __construct(
3334
}
3435

3536
/**
37+
* Return multishipping steps
38+
*
3639
* @return array
3740
*/
3841
public function getSteps()
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AssertMultipleAddressesProgressBarActionGroup">
12+
<waitForPageLoad stepKey="waitForShippingInformation"/>
13+
<seeElement selector="{{MultishippingSection.progressBar}}" stepKey="seeProgressBar"/>
14+
</actionGroup>
15+
</actionGroups>

app/code/Magento/Multishipping/Test/Mftf/Section/MultishippingSection/MultishippingSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1010
<section name="MultishippingSection">
1111
<element name="pageTitle" type="text" selector="//span[text()='Ship to Multiple Addresses']"/>
12+
<element name="progressBar" type="block" selector="#checkout-progress-state"/>
1213
<element name="checkoutWithMultipleAddresses" type="button" selector="//span[text()='Check Out with Multiple Addresses']"/>
1314
<element name="shippingMultipleCheckout" type="button" selector=".action.multicheckout"/>
1415
<element name="shippingAddressSelector" type="select" selector="//tr[position()={{addressPosition}}]//td[@data-th='Send To']//select" parameterized="true"/>

app/code/Magento/Multishipping/Test/Mftf/Test/StoreFrontCheckingWithMultishipmentTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
</actionGroup>
4848
<actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="openCart"/>
4949
<actionGroup ref="CheckingWithMultipleAddressesActionGroup" stepKey="checkoutWithMultipleAddresses"/>
50+
<actionGroup ref="AssertMultipleAddressesProgressBarActionGroup" stepKey="checkProgressBar"/>
5051
<actionGroup ref="SelectMultiShippingInfoActionGroup" stepKey="checkoutWithMultipleShipping"/>
5152
<actionGroup ref="SelectBillingInfoActionGroup" stepKey="checkoutWithPaymentMethod"/>
5253
<actionGroup ref="ReviewOrderForMultiShipmentActionGroup" stepKey="reviewOrderForMultiShipment"/>

app/code/Magento/Multishipping/view/frontend/templates/checkout/state.phtml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@
1515
*/
1616
?>
1717
<ul class="block multicheckout progress items opc-progress-bar" id="checkout-progress-state">
18-
<?php foreach ($block->getSteps() as $_step) : ?>
19-
<li title="<?= $block->escapeHtmlAttr($_step->getLabel()) ?>" class="opc-progress-bar-item item<?= ($_step->getIsActive()) ? ' _active' : '' ?>">
18+
<?php foreach ($block->getSteps() as $_step): ?>
19+
<li title="<?= $block->escapeHtmlAttr($_step->getLabel()) ?>"
20+
class="opc-progress-bar-item item<?= ($_step->getIsActive()) ? ' _active' : '' ?>">
2021
<span><?= $block->escapeHtml($_step->getLabel()) ?></span>
2122
</li>
2223
<?php endforeach; ?>

0 commit comments

Comments
 (0)