Skip to content

Commit 65f880f

Browse files
authored
Revert "feat(bridge-react): add native support for React 19 in bridge-react with enhanced createRoot options" (#3677)
1 parent ed8bda3 commit 65f880f

35 files changed

+148
-971
lines changed

.changeset/breezy-cats-give.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/smart-snails-scream.md

Lines changed: 0 additions & 7 deletions
This file was deleted.
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1+
import { getH2, getH3 } from '../support/app.po';
2+
13
describe('router-host-2000/', () => {
24
beforeEach(() => cy.visit('/'));
35

46
describe('Welcome message', () => {
57
it('should display welcome message', () => {
6-
cy.verifyContent('Router host Home page');
8+
getH2().contains('Router host Home page');
79
});
810
});
911
});
Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,37 @@
1+
import { getH2, getP, getPre } from '../support/app.po';
2+
13
describe('router-host-2000/', () => {
24
beforeEach(() => cy.visit('/'));
35

46
describe('Welcome message', () => {
57
it('should display welcome message', () => {
6-
cy.verifyContent('Router host Home page');
8+
getH2().contains('Router host Home page');
79
});
810
});
911
});
1012

1113
describe('router-host-2000/memory-router', () => {
1214
beforeEach(() => {
1315
cy.visit('/');
14-
cy.clickMenuItem('Memory-router');
16+
cy.get('.host-menu > li:nth-child(6)').click();
1517
});
1618

1719
describe('memory-router', () => {
1820
Cypress.on('uncaught:exception', () => false);
19-
2021
it('remote1', () => {
21-
cy.verifyContent('Remote1 home page');
22-
cy.clickByClass('.self-remote1-detail-link');
23-
cy.verifyContent('Remote1 detail page');
22+
getH2().contains('Remote1 home page');
23+
cy.get('.self-remote1-detail-link').click();
24+
getH2().contains('Remote1 detail page');
2425
});
25-
2626
it('remote2', () => {
27-
cy.verifyContent('Remote2 detail page');
28-
cy.clickByClass('.self-remote2-home-link');
29-
cy.verifyContent('Remote2 home page');
27+
getH2().contains('Remote2 detail page');
28+
cy.get('.self-remote2-home-link').click();
29+
getH2().contains('Remote2 home page');
3030
});
31-
3231
it('remote3', () => {
33-
cy.verifyContent('Remote3 home page');
34-
cy.clickByClass('.self-remote3-detail-link');
35-
cy.verifyContent('Remote3 detail page');
32+
getH2().contains('Remote3 home page');
33+
cy.get('.self-remote3-detail-link').click();
34+
getH2().contains('Remote3 detail page');
3635
});
3736
});
3837
});
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1+
import { getPre, getP } from '../support/app.po';
2+
13
describe('router-remote-error in host', () => {
24
beforeEach(() => cy.visit('/'));
3-
45
describe('Remote Error render and will trigger ErrorBoundary', () => {
56
Cypress.on('uncaught:exception', () => false);
6-
77
it('jump to remote error page', () => {
8-
cy.clickMenuItem('render-error');
9-
cy.verifyContent('Something went wrong');
10-
cy.verifyContent('This is a deliberately thrown error');
8+
cy.get('.host-menu > li:nth-child(7)').click();
9+
getP().contains('Something went wrong');
10+
getPre().contains('This is a deliberately thrown error');
1111
});
1212
});
1313
});
Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,23 @@
1+
import { wait5s, getP, getPre } from '../support/app.po';
2+
13
describe('router-remote-error in host', () => {
24
beforeEach(() => cy.visit('/'));
35

46
describe('Remote Resource Error render and will trigger ErrorBoundary', () => {
57
Cypress.on('uncaught:exception', () => false);
8+
it('jump to remote error page', async () => {
9+
cy.get('.host-menu > li:nth-child(8)').click({ force: true });
10+
11+
cy.get('[data-test-id="loading"]').should('have.length', 1);
12+
cy.get('[data-test-id="loading"]')
13+
.first()
14+
.should('have.text', 'loading...');
615

7-
it('jump to remote error page', () => {
8-
cy.clickMenuItem('resource-error');
9-
cy.checkLoading('[data-test-id="loading"]', 'loading...', 5000);
10-
cy.verifyContent('Something went wrong');
11-
// cy.verifyContent(
12-
// 'The request failed three times and has now been abandoned',
13-
// );
16+
await wait5s();
17+
getP().contains('Something went wrong');
18+
getPre().contains(
19+
'The request failed three times and has now been abandoned',
20+
);
1421
});
1522
});
1623
});
Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1+
import { getH2, getH3, getH4, wait2s } from '../support/app.po';
2+
13
describe('router-remote1-2001/', () => {
24
beforeEach(() => cy.visit('http://localhost:2001/'));
35

46
describe('visit', () => {
57
it('jump to home page', () => {
6-
cy.verifyContent('Remote1 home page');
7-
cy.clickByClass('.self-remote1-detail-link');
8-
cy.verifyContent('Remote1 detail page');
8+
getH2().contains('Remote1 home page');
9+
cy.get('.self-remote1-detail-link').click();
10+
getH2().contains('Remote1 detail page');
911
});
1012
});
1113
});
@@ -15,14 +17,16 @@ describe('router-remote1-2001 in host', () => {
1517

1618
describe('Remote1 render and destroy', () => {
1719
it('jump to remote1 home page', () => {
18-
cy.clickMenuItem('Remote1');
19-
cy.clickByClass('.menu-remote1-home-link');
20-
cy.verifyContent('Remote1 home page');
21-
cy.verifyContent('Ming');
22-
cy.verifyContent('12');
23-
cy.verifyContent('Some text');
24-
cy.clickByClass('.menu-remote1-detail-link');
25-
cy.verifyContent('Remote1 detail page');
20+
cy.get('.host-menu > li:nth-child(3)').click();
21+
cy.get('.menu-remote1-home-link').click();
22+
23+
getH2().contains('Remote1 home page');
24+
getH3().contains('Ming');
25+
getH3().contains('12');
26+
getH4().contains('Some text');
27+
28+
cy.get('.menu-remote1-detail-link').click();
29+
getH2().contains('Remote1 detail page');
2630
});
2731
});
2832
});
Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1+
import { getH2, getH3, wait2s } from '../support/app.po';
2+
13
describe('router-remote2-2002/', () => {
24
beforeEach(() => cy.visit('http://localhost:2002/'));
35

46
describe('visit', () => {
57
it('jump to home page', () => {
6-
cy.verifyContent('Remote2 home page');
7-
cy.clickByClass('.self-remote2-detail-link');
8-
cy.verifyContent('Remote2 detail page');
8+
getH2().contains('Remote2 home page');
9+
cy.get('.self-remote2-detail-link').click();
10+
getH2().contains('Remote2 detail page');
911
});
1012
});
1113
});
@@ -15,11 +17,12 @@ describe('router-remote2-2002 in host', () => {
1517

1618
describe('Remote2 render and destroy', () => {
1719
it('jump to remote2 home page', () => {
18-
cy.clickMenuItem('Remote2');
19-
cy.clickByClass('.menu-remote2-home-link');
20-
cy.verifyContent('Remote2 home page');
21-
cy.clickByClass('.menu-remote2-detail-link');
22-
cy.verifyContent('Remote2 detail page');
20+
cy.get('.host-menu > li:nth-child(4)').click();
21+
cy.get('.menu-remote2-home-link').click();
22+
23+
getH2().contains('Remote2 home page');
24+
cy.get('.menu-remote2-detail-link').click();
25+
getH2().contains('Remote2 detail page');
2326
});
2427
});
2528
});
Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1+
import { getH2, getH3, wait2s } from '../support/app.po';
2+
13
describe('router-remote3-2003/', () => {
24
beforeEach(() => cy.visit('http://localhost:2003/'));
35

46
describe('visit', () => {
57
it('jump to home page', () => {
6-
cy.verifyContent('Remote3 home page');
7-
cy.clickByClass('.self-remote3-detail-link');
8-
cy.verifyContent('Remote3 detail page');
8+
getH2().contains('Remote3 home page');
9+
cy.get('.self-remote3-detail-link').click();
10+
getH2().contains('Remote3 detail page');
911
});
1012
});
1113
});
@@ -15,11 +17,12 @@ describe('router-remote3-2003 in host', () => {
1517

1618
describe('Remote3 render and destroy', () => {
1719
it('jump to remote3 home page', () => {
18-
cy.clickMenuItem('Remote3');
19-
cy.clickByClass('.menu-remote3-home-link');
20-
cy.verifyContent('Remote3 home page');
21-
cy.clickByClass('.menu-remote3-detail-link');
22-
cy.verifyContent('Remote3 detail page');
20+
cy.get('.host-menu > li:nth-child(5)').click();
21+
cy.get('.menu-remote3-home-link').click();
22+
23+
getH2().contains('Remote3 home page');
24+
cy.get('.menu-remote3-detail-link').click();
25+
getH2().contains('Remote3 detail page');
2326
});
2427
});
2528
});

apps/router-demo/router-host-2000/cypress/e2e/remote5.cy.ts

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)