Skip to content

Commit b3802eb

Browse files
authored
A couple of fixes for running Fabric applications without using ContentIslands (#12396)
* Fixes for running without lifted composition * Change files * format * fix * desktop build fix * fix * fix * fix
1 parent e38cc90 commit b3802eb

16 files changed

+1606
-72
lines changed
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "prerelease",
3+
"comment": "Fixes for running without lifted composition",
4+
"packageName": "react-native-windows",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

packages/e2e-test-app-fabric/test/ButtonComponentTest.test.ts

Lines changed: 40 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* @format
66
*/
77

8-
//import {dumpVisualTree} from '@react-native-windows/automation-commands';
8+
import {dumpVisualTree} from '@react-native-windows/automation-commands';
99
import {goToComponentExample} from './RNTesterNavigation';
1010
import {verifyNoErrorLogs} from './Helpers';
1111
import {app} from '@react-native-windows/automation';
@@ -22,48 +22,44 @@ afterEach(async () => {
2222
});
2323

2424
describe('Button Tests', () => {
25-
test('Control', () => {
26-
expect(true).toBe(true);
25+
test('Buttons have default styling', async () => {
26+
const component = await app.findElementByTestID('button_default_styling');
27+
await component.waitForDisplayed({timeout: 5000});
28+
const dump = await dumpVisualTree('button_default_styling');
29+
expect(dump).toMatchSnapshot();
30+
});
31+
test('Buttons can have custom colors', async () => {
32+
const component = await app.findElementByTestID('cancel_button');
33+
await component.waitForDisplayed({timeout: 5000});
34+
const dump = await dumpVisualTree('cancel_button');
35+
expect(dump).toMatchSnapshot();
36+
});
37+
test('Buttons can be disabled', async () => {
38+
const component = await app.findElementByTestID('disabled_button');
39+
await component.waitForDisplayed({timeout: 5000});
40+
const dump = await dumpVisualTree('disabled_button');
41+
expect(dump).toMatchSnapshot();
42+
});
43+
test('Buttons can have accessibility labels', async () => {
44+
const component = await app.findElementByTestID(
45+
'accessibilityLabel_button',
46+
);
47+
await component.waitForDisplayed({timeout: 5000});
48+
const dump = await dumpVisualTree('accessibilityLabel_button');
49+
expect(dump).toMatchSnapshot();
50+
});
51+
test('Buttons can have accessibility states', async () => {
52+
const component = await app.findElementByTestID(
53+
'accessibilityState_button',
54+
);
55+
await component.waitForDisplayed({timeout: 5000});
56+
const dump = await dumpVisualTree('accessibilityState_button');
57+
expect(dump).toMatchSnapshot();
58+
});
59+
test('Buttons can have accessibility props', async () => {
60+
const component = await app.findElementByTestID('accessibility_props');
61+
await component.waitForDisplayed({timeout: 5000});
62+
const dump = await dumpVisualTree('accessibility_props');
63+
expect(dump).toMatchSnapshot();
2764
});
28-
// Disable until tests pass CI
29-
// test('Buttons have default styling', async () => {
30-
// const component = await app.findElementByTestID('button_default_styling');
31-
// await component.waitForDisplayed({timeout: 5000});
32-
// const dump = await dumpVisualTree('button_default_styling');
33-
// expect(dump).toMatchSnapshot();
34-
// });
35-
// test('Buttons can have custom colors', async () => {
36-
// const component = await app.findElementByTestID('cancel_button');
37-
// await component.waitForDisplayed({timeout: 5000});
38-
// const dump = await dumpVisualTree('cancel_button');
39-
// expect(dump).toMatchSnapshot();
40-
// });
41-
// test('Buttons can be disabled', async () => {
42-
// const component = await app.findElementByTestID('disabled_button');
43-
// await component.waitForDisplayed({timeout: 5000});
44-
// const dump = await dumpVisualTree('disabled_button');
45-
// expect(dump).toMatchSnapshot();
46-
// });
47-
// test('Buttons can have accessibility labels', async () => {
48-
// const component = await app.findElementByTestID(
49-
// 'accessibilityLabel_button',
50-
// );
51-
// await component.waitForDisplayed({timeout: 5000});
52-
// const dump = await dumpVisualTree('accessibilityLabel_button');
53-
// expect(dump).toMatchSnapshot();
54-
// });
55-
// test('Buttons can have accessibility states', async () => {
56-
// const component = await app.findElementByTestID(
57-
// 'accessibilityState_button',
58-
// );
59-
// await component.waitForDisplayed({timeout: 5000});
60-
// const dump = await dumpVisualTree('accessibilityState_button');
61-
// expect(dump).toMatchSnapshot();
62-
// });
63-
// test('Buttons can have accessibility props', async () => {
64-
// const component = await app.findElementByTestID('accessibility_props');
65-
// await component.waitForDisplayed({timeout: 5000});
66-
// const dump = await dumpVisualTree('accessibility_props');
67-
// expect(dump).toMatchSnapshot();
68-
// });
6965
});

0 commit comments

Comments
 (0)