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.

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

deps(RHINENG-3032, RHINENG-5932): Upgrade to React 18 & PatternFly 5 #2141

Merged
merged 20 commits into from
Feb 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,7 @@ module.exports = {
globals: {
IS_DEV: 'readonly',
},
rules: {
'rulesdir/forbid-pf-relative-imports': 'off',
},
};
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- stage: Lint
script: npm run lint && commitlint-travis
- stage: Test
script: npm run test && npm run test:ct
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see we have still some cypress tests. Should we keep cypress tests running in travis?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will be re-enabled in #2146

script: npm run test
after_success: npm run coverage
- stage: Tag
if: (fork = false) AND (branch = master)
Expand Down
2 changes: 1 addition & 1 deletion config/setupTests.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jest.mock('@redhat-cloud-services/frontend-components/useChrome', () => ({
},
appAction: jest.fn(),
appObjectId: jest.fn(),
on: jest.fn(),
on: () => jest.fn(),
getUserPermissions: () => Promise.resolve(['inventory:*:*']),
getApp: jest.fn(),
getBundle: jest.fn(),
Expand Down
2 changes: 1 addition & 1 deletion cypress/support/commands.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import FlagProvider from '@unleash/proxy-client-react';
import { Provider } from 'react-redux';
import { getStore } from '../../src/store';
import { MemoryRouter, Route, Routes } from 'react-router-dom';
import { mount } from '@cypress/react';
import { mount } from '@cypress/react18';
import { RBACProvider } from '@redhat-cloud-services/frontend-components/RBACProvider';

Cypress.Commands.add('mountWithContext', (Component, options = {}, props) => {
Expand Down
2 changes: 1 addition & 1 deletion cypress/support/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export const ORDER_TO_URL = {
};

export const selectRowN = (number) => {
cy.get(ROW).eq(number).find('.pf-c-table__check').click();
cy.get(ROW).eq(number).find('.pf-v5-c-table__check').click();
};

export const checkSelectedNumber = (
Expand Down
Loading