Skip to content

Commit b8455e4

Browse files
ddiazccrzddiazccrz
authored
@W-19112464: Fixed Issues identified by doc (#3098)
* Fixed issues identified by Doc * Fixed tests for new labels * Fixed dead code in test
1 parent 31ed766 commit b8455e4

File tree

11 files changed

+55
-67
lines changed

11 files changed

+55
-67
lines changed

‎packages/template-retail-react-app/app/components/forms/use-order-lookup-fields.jsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export default function useOrderLookupFields({
3030
defaultValue: '',
3131
rules: {
3232
required: formatMessage({
33-
defaultMessage: 'Please enter your order number.',
33+
defaultMessage: 'Enter your order number.',
3434
id: 'use_order_lookup_fields.error.required_order_number'
3535
})
3636
},
@@ -52,7 +52,7 @@ export default function useOrderLookupFields({
5252
defaultValue: '',
5353
rules: {
5454
required: formatMessage({
55-
defaultMessage: 'Please enter your email address.',
55+
defaultMessage: 'Enter your email address.',
5656
id: 'use_order_lookup_fields.error.required_email'
5757
})
5858
},

‎packages/template-retail-react-app/app/components/order-lookup/index.test.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ describe('OrderLookupForm', () => {
6868
renderWithProviders(<OrderLookupForm onSubmit={mockOnSubmit} />)
6969
await submitForm()
7070

71-
expect(screen.getByText('Please enter your order number.')).toBeInTheDocument()
72-
expect(screen.getByText('Please enter your email address.')).toBeInTheDocument()
71+
expect(screen.getByText('Enter your order number.')).toBeInTheDocument()
72+
expect(screen.getByText('Enter your email address.')).toBeInTheDocument()
7373
expect(mockOnSubmit).not.toHaveBeenCalled()
7474
})
7575

@@ -81,8 +81,8 @@ describe('OrderLookupForm', () => {
8181
})
8282
await submitForm()
8383

84-
expect(screen.getByText('Please enter your email address.')).toBeInTheDocument()
85-
expect(screen.queryByText('Please enter your order number.')).not.toBeInTheDocument()
84+
expect(screen.getByText('Enter your email address.')).toBeInTheDocument()
85+
expect(screen.queryByText('Enter your order number.')).not.toBeInTheDocument()
8686
expect(mockOnSubmit).not.toHaveBeenCalled()
8787
})
8888

@@ -94,8 +94,8 @@ describe('OrderLookupForm', () => {
9494
})
9595
await submitForm()
9696

97-
expect(screen.getByText('Please enter your order number.')).toBeInTheDocument()
98-
expect(screen.queryByText('Please enter your email address.')).not.toBeInTheDocument()
97+
expect(screen.getByText('Enter your order number.')).toBeInTheDocument()
98+
expect(screen.queryByText('Enter your email address.')).not.toBeInTheDocument()
9999
expect(mockOnSubmit).not.toHaveBeenCalled()
100100
})
101101

‎packages/template-retail-react-app/app/components/order-status-bar/index.jsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import PropTypes from 'prop-types'
1010
import {useIntl} from 'react-intl'
1111
import StatusBar from '@salesforce/retail-react-app/app/components/order-status-bar/status-bar'
1212

13-
const steps = ['Ordered', 'Dispatched', 'Out for delivery', 'Delivered']
13+
const steps = ['Ordered', 'Shipped', 'Out for delivery', 'Delivered']
1414

1515
const OrderStatusBar = ({currentStepLabel}) => {
1616
const theme = useTheme()
@@ -20,10 +20,10 @@ const OrderStatusBar = ({currentStepLabel}) => {
2020
switch (status) {
2121
case 'Ordered':
2222
return intl.formatMessage({id: 'status_bar.ordered', defaultMessage: 'Ordered'})
23-
case 'Dispatched':
23+
case 'Shipped':
2424
return intl.formatMessage({
25-
id: 'status_bar.dispatched',
26-
defaultMessage: 'Dispatched'
25+
id: 'status_bar.shipped',
26+
defaultMessage: 'Shipped'
2727
})
2828
case 'Out for delivery':
2929
return intl.formatMessage({

‎packages/template-retail-react-app/app/components/order-status-bar/index.test.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ describe('OrderStatusBar', () => {
1616
renderWithProviders(<OrderStatusBar />)
1717

1818
expect(screen.getByText('Ordered')).toBeInTheDocument()
19-
expect(screen.getByText('Dispatched')).toBeInTheDocument()
19+
expect(screen.getByText('Shipped')).toBeInTheDocument()
2020
expect(screen.getByText('Out for delivery')).toBeInTheDocument()
2121
expect(screen.getByText('Delivered')).toBeInTheDocument()
2222
})
2323

2424
test('renders step labels with responsive font sizes and word wrapping', () => {
2525
renderWithProviders(<OrderStatusBar />)
2626

27-
const labels = screen.getAllByText(/Ordered|Dispatched|Out for delivery|Delivered/)
27+
const labels = screen.getAllByText(/Ordered|Shipped|Out for delivery|Delivered/)
2828
labels.forEach((label) => {
2929
// Check that the component renders without errors
3030
expect(label).toBeInTheDocument()
@@ -54,8 +54,8 @@ describe('OrderStatusBar', () => {
5454
const {rerender} = renderWithProviders(<OrderStatusBar currentStepLabel="Ordered" />)
5555
expect(screen.getByText('Ordered')).toBeInTheDocument()
5656

57-
rerender(<OrderStatusBar currentStepLabel="Dispatched" />)
58-
expect(screen.getByText('Dispatched')).toBeInTheDocument()
57+
rerender(<OrderStatusBar currentStepLabel="Shipped" />)
58+
expect(screen.getByText('Shipped')).toBeInTheDocument()
5959

6060
rerender(<OrderStatusBar currentStepLabel="Delivered" />)
6161
expect(screen.getByText('Delivered')).toBeInTheDocument()
@@ -69,7 +69,7 @@ describe('OrderStatusBar', () => {
6969
rerender(<OrderStatusBar currentStepLabel={undefined} />)
7070
expect(screen.getByText('Ordered')).toBeInTheDocument()
7171

72-
rerender(<OrderStatusBar currentStepLabel={['Ordered', 'Dispatched']} />)
72+
rerender(<OrderStatusBar currentStepLabel={['Ordered', 'Shipped']} />)
7373
expect(screen.getByText('Ordered')).toBeInTheDocument()
7474
})
7575

@@ -86,7 +86,7 @@ describe('OrderStatusBar', () => {
8686
test('renders text labels with correct styling properties', () => {
8787
renderWithProviders(<OrderStatusBar />)
8888

89-
const labels = screen.getAllByText(/Ordered|Dispatched|Out for delivery|Delivered/)
89+
const labels = screen.getAllByText(/Ordered|Shipped|Out for delivery|Delivered/)
9090
labels.forEach((label) => {
9191
// Check that labels are rendered
9292
expect(label).toBeInTheDocument()
@@ -99,8 +99,8 @@ describe('OrderStatusBar', () => {
9999
expect(screen.getByText('Ordered')).toBeInTheDocument()
100100

101101
// Test with different case
102-
rerender(<OrderStatusBar currentStepLabel="DISPATCHED" />)
103-
expect(screen.getByText('Dispatched')).toBeInTheDocument()
102+
rerender(<OrderStatusBar currentStepLabel="SHIPPED" />)
103+
expect(screen.getByText('Shipped')).toBeInTheDocument()
104104

105105
// Test with mixed case
106106
rerender(<OrderStatusBar currentStepLabel="Out For Delivery" />)

‎packages/template-retail-react-app/app/pages/account/order-history.test.js‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44
* SPDX-License-Identifier: BSD-3-Clause
55
* For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/BSD-3-Clause
66
*/
7-
import React from 'react'
8-
import {render} from '@testing-library/react'
9-
import {IntlProvider} from 'react-intl'
10-
import {ChakraProvider} from '@chakra-ui/react'
117
import {getOrderStatusColorScheme} from '@salesforce/retail-react-app/app/pages/account/order-history'
128

139
// Mock the commerce-sdk-react hooks
@@ -50,14 +46,6 @@ jest.mock('@salesforce/pwa-kit-react-sdk/ssr/universal/hooks', () => ({
5046
}))
5147

5248
describe('Order Status Badge Colors', () => {
53-
const renderWithProviders = (component) => {
54-
return render(
55-
<IntlProvider locale="en">
56-
<ChakraProvider>{component}</ChakraProvider>
57-
</IntlProvider>
58-
)
59-
}
60-
6149
test('getOrderStatusColorScheme helper returns correct colors for cancelled status', () => {
6250
const cancelledColor = getOrderStatusColorScheme('cancelled')
6351
expect(cancelledColor).toEqual({

‎packages/template-retail-react-app/app/pages/order-status/index.jsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ const OrderStatusPage = () => {
4646
return (
4747
<Box data-testid="order-status-page" bg="gray.50">
4848
<Container py={{base: 8, md: 8}} pt={{base: 12, md: 24}}>
49-
<Heading as="h1" size="lg" textAlign="left" tabIndex="0" ref={headingRef}>
49+
<Heading as="h1" size="lg" textAlign="center" tabIndex="0" ref={headingRef}>
5050
<FormattedMessage
5151
defaultMessage="Order Status"
5252
id="order_status_page.heading.order_status"

‎packages/template-retail-react-app/app/static/translations/compiled/en-GB.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3627,12 +3627,6 @@
36273627
"value": "Delivered"
36283628
}
36293629
],
3630-
"status_bar.dispatched": [
3631-
{
3632-
"type": 0,
3633-
"value": "Dispatched"
3634-
}
3635-
],
36363630
"status_bar.ordered": [
36373631
{
36383632
"type": 0,
@@ -3645,6 +3639,12 @@
36453639
"value": "Out for delivery"
36463640
}
36473641
],
3642+
"status_bar.shipped": [
3643+
{
3644+
"type": 0,
3645+
"value": "Shipped"
3646+
}
3647+
],
36483648
"store_display.format.address_line_2": [
36493649
{
36503650
"type": 1,
@@ -4172,13 +4172,13 @@
41724172
"use_order_lookup_fields.error.required_email": [
41734173
{
41744174
"type": 0,
4175-
"value": "Please enter your email address."
4175+
"value": "Enter your email address."
41764176
}
41774177
],
41784178
"use_order_lookup_fields.error.required_order_number": [
41794179
{
41804180
"type": 0,
4181-
"value": "Please enter your order number."
4181+
"value": "Enter your order number."
41824182
}
41834183
],
41844184
"use_order_lookup_fields.label.email": [

‎packages/template-retail-react-app/app/static/translations/compiled/en-US.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3627,12 +3627,6 @@
36273627
"value": "Delivered"
36283628
}
36293629
],
3630-
"status_bar.dispatched": [
3631-
{
3632-
"type": 0,
3633-
"value": "Dispatched"
3634-
}
3635-
],
36363630
"status_bar.ordered": [
36373631
{
36383632
"type": 0,
@@ -3645,6 +3639,12 @@
36453639
"value": "Out for delivery"
36463640
}
36473641
],
3642+
"status_bar.shipped": [
3643+
{
3644+
"type": 0,
3645+
"value": "Shipped"
3646+
}
3647+
],
36483648
"store_display.format.address_line_2": [
36493649
{
36503650
"type": 1,
@@ -4172,13 +4172,13 @@
41724172
"use_order_lookup_fields.error.required_email": [
41734173
{
41744174
"type": 0,
4175-
"value": "Please enter your email address."
4175+
"value": "Enter your email address."
41764176
}
41774177
],
41784178
"use_order_lookup_fields.error.required_order_number": [
41794179
{
41804180
"type": 0,
4181-
"value": "Please enter your order number."
4181+
"value": "Enter your order number."
41824182
}
41834183
],
41844184
"use_order_lookup_fields.label.email": [

‎packages/template-retail-react-app/app/static/translations/compiled/en-XA.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7707,42 +7707,42 @@
77077707
"value": "]"
77087708
}
77097709
],
7710-
"status_bar.dispatched": [
7710+
"status_bar.ordered": [
77117711
{
77127712
"type": 0,
77137713
"value": "["
77147714
},
77157715
{
77167716
"type": 0,
7717-
"value": "Ḓīşƥȧȧŧƈħḗḗḓ"
7717+
"value": "Ǿřḓḗḗřḗḗḓ"
77187718
},
77197719
{
77207720
"type": 0,
77217721
"value": "]"
77227722
}
77237723
],
7724-
"status_bar.ordered": [
7724+
"status_bar.out_for_delivery": [
77257725
{
77267726
"type": 0,
77277727
"value": "["
77287728
},
77297729
{
77307730
"type": 0,
7731-
"value": "Ǿřḓḗḗřḗḗḓ"
7731+
"value": "Ǿŭŭŧ ƒǿǿř ḓḗḗŀīṽḗḗřẏ"
77327732
},
77337733
{
77347734
"type": 0,
77357735
"value": "]"
77367736
}
77377737
],
7738-
"status_bar.out_for_delivery": [
7738+
"status_bar.shipped": [
77397739
{
77407740
"type": 0,
77417741
"value": "["
77427742
},
77437743
{
77447744
"type": 0,
7745-
"value": "Ǿŭŭŧ ƒǿǿř ḓḗḗŀīṽḗḗřẏ"
7745+
"value": "Şħīƥƥḗḗḓ"
77467746
},
77477747
{
77487748
"type": 0,
@@ -8872,7 +8872,7 @@
88728872
},
88738873
{
88748874
"type": 0,
8875-
"value": "Ƥŀḗḗȧȧşḗḗ ḗḗƞŧḗḗř ẏǿǿŭŭř ḗḗḿȧȧīŀ ȧȧḓḓřḗḗşş."
8875+
"value": "Ḗƞŧḗḗř ẏǿǿŭŭř ḗḗḿȧȧīŀ ȧȧḓḓřḗḗşş."
88768876
},
88778877
{
88788878
"type": 0,
@@ -8886,7 +8886,7 @@
88868886
},
88878887
{
88888888
"type": 0,
8889-
"value": "Ƥŀḗḗȧȧşḗḗ ḗḗƞŧḗḗř ẏǿǿŭŭř ǿǿřḓḗḗř ƞŭŭḿƀḗḗř."
8889+
"value": "Ḗƞŧḗḗř ẏǿǿŭŭř ǿǿřḓḗḗř ƞŭŭḿƀḗḗř."
88908890
},
88918891
{
88928892
"type": 0,

‎packages/template-retail-react-app/translations/en-GB.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1544,15 +1544,15 @@
15441544
"status_bar.delivered": {
15451545
"defaultMessage": "Delivered"
15461546
},
1547-
"status_bar.dispatched": {
1548-
"defaultMessage": "Dispatched"
1549-
},
15501547
"status_bar.ordered": {
15511548
"defaultMessage": "Ordered"
15521549
},
15531550
"status_bar.out_for_delivery": {
15541551
"defaultMessage": "Out for delivery"
15551552
},
1553+
"status_bar.shipped": {
1554+
"defaultMessage": "Shipped"
1555+
},
15561556
"store_display.format.address_line_2": {
15571557
"defaultMessage": "{city}, {stateCode} {postalCode}"
15581558
},
@@ -1778,10 +1778,10 @@
17781778
"defaultMessage": "Password"
17791779
},
17801780
"use_order_lookup_fields.error.required_email": {
1781-
"defaultMessage": "Please enter your email address."
1781+
"defaultMessage": "Enter your email address."
17821782
},
17831783
"use_order_lookup_fields.error.required_order_number": {
1784-
"defaultMessage": "Please enter your order number."
1784+
"defaultMessage": "Enter your order number."
17851785
},
17861786
"use_order_lookup_fields.label.email": {
17871787
"defaultMessage": "Email"

0 commit comments

Comments
 (0)