Skip to content

Commit 75879d8

Browse files
Merge branch 'dev' of https://github.com/DevExpress/devextreme-cli into dev_nextjs
# Conflicts: # packages/devextreme-cli/src/templates/nextjs/sample-pages/profile/page.tsx # packages/devextreme-cli/src/templates/nextjs/sample-pages/profile/profile.scss
2 parents 7e69375 + af346e4 commit 75879d8

File tree

5 files changed

+8
-6
lines changed

5 files changed

+8
-6
lines changed

.github/workflows/schedule-cli-tests-latest-version.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
name: Run CLI tests
1111
uses: ./.github/workflows/applications.yml
1212
with:
13-
external-tools-version-tag: latest
13+
deps-version-tag: latest
1414

1515
teams_notification_on_failure:
1616
name: Send Teams notification

.github/workflows/schedule-cli-tests-next-version.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
name: Run CLI tests
1111
uses: ./.github/workflows/applications.yml
1212
with:
13-
external-tools-version-tag: next
13+
deps-version-tag: next
1414

1515
teams_notification_on_failure:
1616
name: Send Teams notification

packages/devextreme-cli/src/templates/nextjs/sample-pages/profile/page.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,9 @@ export default function Page() {
3232
src={`https://js.devexpress.com/Demos/WidgetsGallery/JSDemos/${
3333
employee.Picture
3434
}`}
35-
width={93.5}
36-
height={120}
35+
width={374}
36+
height={480}
37+
unoptimized={true}
3738
/>
3839
</div>
3940
<span>{notes}</span>

packages/devextreme-cli/src/templates/nextjs/sample-pages/profile/profile.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
img {
1414
height: 120px;
15+
width: auto;
1516
display: block;
1617
margin: 0 auto;
1718
}

packages/devextreme-cli/testing/app-template.test.shared.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@ module.exports = (env, { port = 8080, urls = {} } = {}) => {
8686

8787
const customConfig = { threshold: 0.012 };
8888

89-
function compareSnapshot(image, name) {
89+
function compareSnapshot(image, name, overrideConfig = {}) {
9090
expect(image).toMatchImageSnapshot({
91-
customDiffConfig: customConfig,
91+
customDiffConfig: { ...customConfig, ...overrideConfig },
9292
customSnapshotIdentifier: `${layout}-${theme}-${viewportName}-${name}-snap`,
9393
customDiffDir: diffSnapshotsDir,
9494
storeReceivedOnFailure: true,

0 commit comments

Comments
 (0)