Skip to content

Commit

Permalink
replay #1128 from bad merge
Browse files Browse the repository at this point in the history
  • Loading branch information
bfeister committed May 9, 2023
1 parent f5b14d0 commit 65293a2
Show file tree
Hide file tree
Showing 18 changed files with 23 additions and 397 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
* For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/BSD-3-Clause
*/
import React from 'react'
import {renderWithProviders} from 'retail-react-app/app/utils/test-utils'
import ImageTile from 'retail-react-app/app/page-designer/assets/image-tile/index'
import {renderWithProviders} from '../../../utils/test-utils'
import ImageTile from './index'
import {getAssetUrl} from 'pwa-kit-react-sdk/ssr/universal/utils'

test('ImageTile renders without errors', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
import React from 'react'
import PropTypes from 'prop-types'
import {Box, Image, Link as ChakraLink, Text} from '@chakra-ui/react'
import Link from 'retail-react-app/app/components/link'
import {isAbsoluteURL} from 'retail-react-app/app/page-designer/utils'
import Link from '../../../components/link'
import {isAbsoluteURL} from '../../utils'

/**
* Image with text component
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
* For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/BSD-3-Clause
*/
import React from 'react'
import ImageWithText from 'retail-react-app/app/page-designer/assets/image-with-text/index'
import {renderWithProviders} from 'retail-react-app/app/utils/test-utils'
import ImageWithText from './index'
import {renderWithProviders} from '../../../utils/test-utils'

const SAMPLE_DATA = {
ITCLink: 'https://salesforce.com',
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 65293a2

Please sign in to comment.