Skip to content

Commit 310cf54

Browse files
Merge branch 'master' into fix/analytical-table-style-warnings
2 parents 294b24c + 11c8684 commit 310cf54

File tree

6 files changed

+23
-13
lines changed

6 files changed

+23
-13
lines changed

packages/main/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"react-content-loader": "5.1.3",
3939
"react-jss": "10.1.1",
4040
"react-table": "7.6.0",
41-
"react-virtual": "2.2.8"
41+
"react-virtual": "2.3.0"
4242
},
4343
"peerDependencies": {
4444
"@ui5/webcomponents": "1.0.0-rc.9",
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1+
import { render } from '@shared/tests';
12
import { Token } from '@ui5/webcomponents-react/lib/Token';
2-
import { mount } from 'enzyme';
33
import React from 'react';
44

55
describe('Token', () => {
66
test('Basic Test (generated)', () => {
7-
const wrapper = mount(<Token />);
8-
expect(wrapper.render()).toMatchSnapshot();
7+
const { asFragment } = render(<Token />);
8+
expect(asFragment()).toMatchSnapshot();
99
});
1010
});
Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
11
// Jest Snapshot v1, https://goo.gl/fbAQLP
22

3-
exports[`Token Basic Test (generated) 1`] = `<ui5-token />`;
3+
exports[`Token Basic Test (generated) 1`] = `
4+
<DocumentFragment>
5+
<ui5-token
6+
ui5-token=""
7+
/>
8+
</DocumentFragment>
9+
`;
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1+
import { render } from '@shared/tests';
12
import { Tokenizer } from '@ui5/webcomponents-react/lib/Tokenizer';
2-
import { mount } from 'enzyme';
33
import React from 'react';
44

55
describe('Tokenizer', () => {
66
test('Basic Test (generated)', () => {
7-
const wrapper = mount(<Tokenizer />);
8-
expect(wrapper.render()).toMatchSnapshot();
7+
const { asFragment } = render(<Tokenizer />);
8+
expect(asFragment()).toMatchSnapshot();
99
});
1010
});
Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
// Jest Snapshot v1, https://goo.gl/fbAQLP
22

3-
exports[`Tokenizer Basic Test (generated) 1`] = `<ui5-tokenizer />`;
3+
exports[`Tokenizer Basic Test (generated) 1`] = `
4+
<DocumentFragment>
5+
<ui5-tokenizer />
6+
</DocumentFragment>
7+
`;

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17281,10 +17281,10 @@ react-transition-group@^2.5.0:
1728117281
prop-types "^15.6.2"
1728217282
react-lifecycles-compat "^3.0.4"
1728317283

17284-
react-virtual@2.2.8:
17285-
version "2.2.8"
17286-
resolved "https://registry.yarnpkg.com/react-virtual/-/react-virtual-2.2.8.tgz#1efcb2fdcfc66974aa7b34977496e977afd1a657"
17287-
integrity sha512-sNMeqgDL4Ur2mW3clSMfZZL0/DQMl+J4zJABPEztQTN17rPEKdTMFuq/roy3RBz+2AI3olgdsxaKznPOtCzLZA==
17284+
react-virtual@2.3.0:
17285+
version "2.3.0"
17286+
resolved "https://registry.yarnpkg.com/react-virtual/-/react-virtual-2.3.0.tgz#49d128062d914dfe5238772644eace6f672a7077"
17287+
integrity sha512-9hxv90KG/p50hNr46VW4ORo3a9oFJ7ty17KB/qMGAagExNH7koKsq/47wlK5IP9CsgBSkItBQrIJcoCap3i2MQ==
1728817288
dependencies:
1728917289
"@reach/observe-rect" "^1.1.0"
1729017290
ts-toolbelt "^6.4.2"

0 commit comments

Comments
 (0)