Skip to content

Commit 525da84

Browse files
committed
test(web native): updates
1 parent 4603dcf commit 525da84

19 files changed

+623
-391
lines changed

package-lock.json

Lines changed: 42 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,7 @@
4747
"lint": "eslint --ext .jsx --ext .ts,.tsx src/",
4848
"release": "semantic-release"
4949
},
50-
"dependencies": {
51-
"react-syntax-highlighter": "^12.2.1"
52-
},
50+
"dependencies": {},
5351
"devDependencies": {
5452
"@babel/core": "7.7.7",
5553
"@babel/polyfill": "7.7.0",
@@ -90,6 +88,7 @@
9088
"react-dom": "16.12.0",
9189
"react-native": "0.61.5",
9290
"react-native-svg": "9.13.6",
91+
"react-syntax-highlighter": "^12.2.1",
9392
"react-test-renderer": "16.12.0",
9493
"rollup": "1.27.14",
9594
"rollup-plugin-copy": "3.1.0",

src/native/ContentLoader.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { Facebook, IContentLoaderProps } from '.'
55
import Svg from './Svg'
66

77
const ContentLoader: React.FC<IContentLoaderProps> = props =>
8-
props.children ? <Svg {...props}></Svg> : <Facebook {...props} />
8+
props.children ? <Svg {...props} /> : <Facebook {...props} />
99

1010
export { Circle, Rect }
1111

src/native/Svg.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@ class NativeSvg extends Component<IContentLoaderProps, { offset: number }> {
1616
static defaultProps = {
1717
animate: true,
1818
backgroundColor: '#f5f6f7',
19-
rtl: false,
2019
foregroundColor: '#eee',
20+
rtl: false,
2121
speed: 1.2,
22+
style: {},
2223
}
2324

2425
state = { offset: -1 }

src/native/__tests__/ContentLoader.test.tsx

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@ describe('ContentLoader', () => {
2525

2626
describe('Props are propagated', () => {
2727
const noPropsComponent = ShallowRenderer.createRenderer()
28-
noPropsComponent.render(<ContentLoader />)
28+
noPropsComponent.render(
29+
<ContentLoader>
30+
<Rect />
31+
</ContentLoader>
32+
)
2933

3034
const withPropsComponent = ShallowRenderer.createRenderer()
3135
withPropsComponent.render(
@@ -39,7 +43,9 @@ describe('ContentLoader', () => {
3943
speed={10}
4044
style={{ marginBottom: '10px' }}
4145
width={200}
42-
/>
46+
>
47+
<Rect />
48+
</ContentLoader>
4349
)
4450

4551
const { props: propsFromEmpty } = noPropsComponent.getRenderOutput()
@@ -48,25 +54,19 @@ describe('ContentLoader', () => {
4854
it("`speed` is a number and it's used", () => {
4955
// defaultProps
5056
expect(typeof propsFromEmpty.speed).toBe('number')
51-
expect(propsFromEmpty.speed).toBe(1)
57+
expect(propsFromEmpty.speed).toBe(1.2)
5258
// custom props
5359
expect(typeof propsFromFullField.speed).toBe('number')
5460
expect(propsFromFullField.speed).toBe(10)
5561
})
5662

5763
it("`height` is a number and it's used", () => {
58-
// defaultProps
59-
expect(typeof propsFromEmpty.height).toBe('number')
60-
expect(propsFromEmpty.height).toBe(130)
6164
// custom props
6265
expect(typeof propsFromFullField.height).toBe('number')
6366
expect(propsFromFullField.height).toBe(200)
6467
})
6568

6669
it("`width` is a number and it's used", () => {
67-
// defaultProps
68-
expect(typeof propsFromEmpty.width).toBe('number')
69-
expect(propsFromEmpty.width).toBe(400)
7070
// custom props
7171
expect(typeof propsFromFullField.width).toBe('number')
7272
expect(propsFromFullField.width).toBe(200)
@@ -84,7 +84,7 @@ describe('ContentLoader', () => {
8484
it("`backgroundColor` is a string and it's used", () => {
8585
// defaultProps
8686
expect(typeof propsFromEmpty.backgroundColor).toBe('string')
87-
expect(propsFromEmpty.backgroundColor).toBe('#f0f0f0')
87+
expect(propsFromEmpty.backgroundColor).toBe('#f5f6f7')
8888
// custom props
8989
expect(typeof propsFromFullField.backgroundColor).toBe('string')
9090
expect(propsFromFullField.backgroundColor).toBe('#000')
@@ -93,7 +93,7 @@ describe('ContentLoader', () => {
9393
it("`foregroundColor` is a string and it's used", () => {
9494
// defaultProps
9595
expect(typeof propsFromEmpty.foregroundColor).toBe('string')
96-
expect(propsFromEmpty.foregroundColor).toBe('#e0e0e0')
96+
expect(propsFromEmpty.foregroundColor).toBe('#eee')
9797
// custom props
9898
expect(typeof propsFromFullField.foregroundColor).toBe('string')
9999
expect(propsFromFullField.foregroundColor).toBe('#fff')

0 commit comments

Comments
 (0)