Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixes-for-customer-name-twice-desktop #20832

Merged
merged 6 commits into from
Apr 16, 2019
Merged

fixes-for-customer-name-twice-desktop #20832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7ee12b0
fixes-for-customer-name-twice-desktop
priti2jcommerce Apr 4, 2019
921f7b9
magento/magento2#20832: MFTF test fix.
p-bystritsky Apr 10, 2019
7314d76
Merge remote-tracking branch 'mainline/2.3-develop' into fixes-for-cu…
p-bystritsky Apr 10, 2019
a2b2aa0
magento/magento2#20832: MFTF test fix.
p-bystritsky Apr 11, 2019
6c14bd8
magento/magento2#20832: Static test fix.
p-bystritsky Apr 12, 2019
d9568f4
Merge branch '2.3-develop-mainline' into fixes-for-customer-name-twic…
p-bystritsky Apr 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerActionGroup.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
<actionGroup name="CustomerLogoutStorefrontByMenuItemsActionGroup">
<conditionalClick selector="{{StorefrontPanelHeaderSection.customerWelcome}}"
dependentSelector="{{StorefrontPanelHeaderSection.customerWelcomeMenu}}"
<conditionalClick selector="{{StorefrontPanelHeaderSection.customerWelcomeMenu}}"
dependentSelector="{{StorefrontPanelHeaderSection.customerLogoutLink}}"
visible="false"
stepKey="clickHeaderCustomerMenuButton" />
<click selector="{{StorefrontPanelHeaderSection.customerLogoutLink}}" stepKey="clickSignOutButton" />
Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<element name="welcomeMessage" type="text" selector="header>.panel .greet.welcome" />
<element name="createAnAccountLink" type="select" selector="//div[@class='panel wrapper']//li/a[contains(.,'Create an Account')]" timeout="30"/>
<element name="notYouLink" type="button" selector=".greet.welcome span a"/>
<element name="customerWelcome" type="text" selector=".panel.header .customer-welcome"/>
<element name="customerWelcomeMenu" type="text" selector=".panel.header .customer-welcome .customer-menu"/>
<element name="customerWelcome" type="text" selector=".panel.header .greet.welcome"/>
<element name="customerWelcomeMenu" type="text" selector=".panel.header .customer-welcome .customer-name"/>
<element name="customerLoginLink" type="button" selector=".panel.header .header.links .authorization-link a" timeout="30"/>
<element name="customerLogoutLink" type="text" selector=".panel.header .customer-welcome .customer-menu .authorization-link a" timeout="30"/>
</section>
Expand Down
1 change: 0 additions & 1 deletion app/code/Magento/Customer/view/frontend/templates/account/customer.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
data-toggle="dropdown"
data-trigger-keypress-button="true"
data-bind="scope: 'customer'">
<span data-bind="text: customer().fullname"></span>
<button type="button"
class="action switch"
tabindex="-1"
Expand Down
4 changes: 4 additions & 0 deletions app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,10 @@
font-size: @font-size__base;
margin: 0 0 0 15px;

&.customer-welcome {
margin: 0 0 0 5px;
}

> a {
.lib-link(
@_link-color: @header-panel__text-color,
Expand Down