Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/next'
Browse files Browse the repository at this point in the history
  • Loading branch information
Quentin Decré committed Jan 15, 2024
2 parents b62cdb6 + c25e4e1 commit d29331e
Show file tree
Hide file tree
Showing 387 changed files with 13,843 additions and 14,187 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Use Node.js LTS
uses: actions/setup-node@v1
with:
node-version: '16.x'
node-version: '18.x'
- uses: bahmutov/npm-install@v1
with:
install-command: yarn --immutable
Expand All @@ -37,7 +37,7 @@ jobs:
- name: Use Node.js LTS
uses: actions/setup-node@v1
with:
node-version: '16.x'
node-version: '18.x'
- uses: bahmutov/npm-install@v1
with:
install-command: yarn --immutable
Expand All @@ -54,7 +54,7 @@ jobs:
- name: Use Node.js LTS
uses: actions/setup-node@v1
with:
node-version: '16.x'
node-version: '18.x'
- uses: bahmutov/npm-install@v1
with:
install-command: yarn --immutable
Expand All @@ -71,7 +71,7 @@ jobs:
- name: Use Node.js LTS
uses: actions/setup-node@v1
with:
node-version: '16.x'
node-version: '18.x'
- uses: bahmutov/npm-install@v1
with:
install-command: yarn --immutable
Expand Down Expand Up @@ -100,7 +100,7 @@ jobs:
- name: Use Node.js LTS
uses: actions/setup-node@v1
with:
node-version: '16.x'
node-version: '18.x'
- uses: bahmutov/npm-install@v1
with:
install-command: yarn --immutable
Expand Down
363 changes: 0 additions & 363 deletions .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

This file was deleted.

768 changes: 0 additions & 768 deletions .yarn/releases/yarn-3.1.1.cjs

This file was deleted.

893 changes: 893 additions & 0 deletions .yarn/releases/yarn-4.0.2.cjs

Large diffs are not rendered by default.

7 changes: 2 additions & 5 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
compressionLevel: 0

enableGlobalCache: true
enableHardenedMode: false

nodeLinker: node-modules

plugins:
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
spec: "@yarnpkg/plugin-interactive-tools"

yarnPath: .yarn/releases/yarn-3.1.1.cjs
yarnPath: .yarn/releases/yarn-4.0.2.cjs
3 changes: 3 additions & 0 deletions cypress/e2e/list.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,9 @@ describe('List Page', () => {
LoginPage.login('admin', 'password');
ListPagePosts.navigate();
ListPagePosts.showFilter('title');
cy.get(ListPagePosts.elements.filter('title')).should(el =>
expect(el).to.have.value('Qui tempore rerum et voluptates')
);
ListPagePosts.setFilterValue(
'title',
'Omnis voluptate enim similique est possimus'
Expand Down
6 changes: 3 additions & 3 deletions cypress/e2e/mobile.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ describe('Mobile UI', () => {
});

describe('Infinite Scroll', () => {
it.only('should load more items when scrolling to the bottom of the page', () => {
it('should load more items when scrolling to the bottom of the page', () => {
ListPagePosts.navigate();
cy.contains('Sint dignissimos in architecto aut');
cy.contains('Sed quo et et fugiat modi').should('not.exist');
cy.scrollTo('bottom');
cy.wait(500);
cy.scrollTo('bottom');
cy.contains('Sint dignissimos in architecto aut').scrollIntoView();
cy.contains('Sed quo et et fugiat modi');
});
});
Expand Down
2 changes: 1 addition & 1 deletion cypress/support/CustomFormPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export default url => ({
"[data-testid='dialog-add-post'] button[type='submit']",
submitAndAddButton:
".create-page form>div:last-child button[type='button']",
postSelect: '.ra-input-post_id [role="button"]',
postSelect: '.ra-input-post_id',
postItem: id => `li[data-value="${id}"]`,
showPostCreateModalButton: '[data-value="@@ra-create"]',
showPostPreviewModalButton: '[data-testid="button-show-post"]',
Expand Down
2 changes: 1 addition & 1 deletion cypress/support/ListPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export default url => ({
filter: name => `.filter-field[data-source='${name}'] input`,
filterButton: name => `.filter-field[data-source='${name}']`,
filterMenuItems: `.new-filter-item`,
menuItems: `[role=menuitem]`,
menuItems: `a[role=menuitem]`,
filterMenuItem: source => `.new-filter-item[data-key="${source}"]`,
hideFilterButton: source =>
`.filter-field[data-source="${source}"] .hide-filter`,
Expand Down
Loading

0 comments on commit d29331e

Please sign in to comment.