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

fix: upgrade yarn.lock #1250

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
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
2 changes: 2 additions & 0 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,8 @@ jobs:
include:
- platform: linux/arm64
default: false
- platform: linux/s390x
default: false
steps:
-
name: "Checkout Che Dashboard source code"
Expand Down
875 changes: 0 additions & 875 deletions .yarn/releases/yarn-3.8.6.cjs

This file was deleted.

934 changes: 934 additions & 0 deletions .yarn/releases/yarn-4.5.1.cjs

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
compressionLevel: mixed

enableGlobalCache: false

httpRetry: 3

httpTimeout: 600000
Expand All @@ -20,4 +24,4 @@ packageExtensions:
dependencies:
prop-types: "*"

yarnPath: .yarn/releases/yarn-3.8.6.cjs
yarnPath: .yarn/releases/yarn-4.5.1.cjs
5 changes: 5 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@
},
"resolutions": {
"@adobe/css-tools": "^4.3.2",
"@babel/plugin-syntax-import-meta": "7.2.0",
"@babel/plugin-syntax-json-strings": "7.2.0",
"@babel/plugin-syntax-jsx": "7.12.1",
"@babel/plugin-syntax-logical-assignment-operators": "7.2.0",
"@babel/plugin-syntax-nullish-coalescing-operator": "7.2.0",
"@codemirror/autocomplete": "6.18.1",
"@hapi/hoek": "^10.0.1",
"axios": "^1.7.4",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ describe('Error boundary', () => {
});

afterEach(() => {
jest.clearAllMocks();
window.location.reload = reload;
sessionStorage.removeItem(STORAGE_KEY_RELOAD_NUMBER);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ describe('StoreErrorAlert component', () => {
});

afterEach(() => {
jest.clearAllMocks();
container.restore();
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -542,6 +542,7 @@ describe('WorkspaceActionsDropdown', () => {
});

afterEach(() => {
jest.clearAllMocks();
container.restore();
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,33 +54,30 @@ describe('Workspace Details page', () => {
});

describe('Tabs', () => {
it('should activate the Overview tab by default', async () => {
it('should have four tabs visible', async () => {
const workspace = constructWorkspace(devWorkspaceBuilder.build());
renderComponent({
workspace,
});

expect(await screen.findByRole('tabpanel', { name: 'Overview' })).not.toBeNull();
const overviewTab = await screen.findByRole('tab', { name: 'Overview' });
const devfileTab = await screen.findByRole('tab', { name: 'Devfile' });
const logsTab = await screen.findByRole('tab', { name: 'Logs' });
const eventsTab = await screen.findByRole('tab', { name: 'Events' });

expect(overviewTab).not.toBeNull();
expect(devfileTab).not.toBeNull();
expect(logsTab).not.toBeNull();
expect(eventsTab).not.toBeNull();
});

it('should have four tabs visible', () => {
it('should activate the Overview tab by default', async () => {
const workspace = constructWorkspace(devWorkspaceBuilder.build());
renderComponent({
workspace,
});

const allTabs = screen.getAllByRole('tab');
expect(allTabs.length).toBe(4);

const overviewTab = screen.queryByRole('tab', { name: 'Overview' });
const devfileTab = screen.queryByRole('tab', { name: 'Devfile' });
const logsTab = screen.queryByRole('tab', { name: 'Logs' });
const eventsTab = screen.queryByRole('tab', { name: 'Events' });

expect(overviewTab).not.toBeNull();
expect(devfileTab).not.toBeNull();
expect(logsTab).not.toBeNull();
expect(eventsTab).not.toBeNull();
expect(await screen.findByRole('tabpanel', { name: 'Overview' })).not.toBeNull();
});

it('should switch to the Devfile tab', async () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ describe('test storePathnameIfNeeded()', () => {
});

afterEach(() => {
mockUpdate.mockClear();
jest.clearAllMocks();
});

test('regular path', () => {
Expand Down
Loading
Loading