Skip to content

Commit f135363

Browse files
code formatting
1 parent d3db5e5 commit f135363

12 files changed

Lines changed: 202 additions & 160 deletions

src/SplitClient.tsx

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,13 @@ export class SplitComponent extends React.Component<IUpdateProps & { factory: Sp
119119
render() {
120120
const { children } = this.props;
121121
return (
122-
<SplitContext.Provider value={this.state} >{
123-
typeof children === 'function' ?
124-
children({ ...this.state }) :
125-
children
126-
}</SplitContext.Provider>
122+
<SplitContext.Provider value={this.state} >
123+
{
124+
typeof children === 'function' ?
125+
children({ ...this.state }) :
126+
children
127+
}
128+
</SplitContext.Provider>
127129
);
128130
}
129131
}
@@ -140,15 +142,15 @@ export class SplitComponent extends React.Component<IUpdateProps & { factory: Sp
140142
*/
141143
export function SplitClient(props: ISplitClientProps) {
142144
return (
143-
<SplitContext.Consumer>{
144-
(splitContext: ISplitContextValues) => {
145+
<SplitContext.Consumer>
146+
{(splitContext: ISplitContextValues) => {
145147
const { factory } = splitContext;
146148
// getSplitSharedClient is idempotent like factory.client: it returns the same client given the same factory, Split Key and TT
147149
const client = factory ? getSplitSharedClient(factory, props.splitKey, props.trafficType, props.attributes) : null;
148150
return (
149151
<SplitComponent {...props} factory={factory} client={client} attributes={props.attributes} />
150152
);
151-
}
152-
}</SplitContext.Consumer>
153+
}}
154+
</SplitContext.Consumer>
153155
);
154156
}

src/__tests__/SplitClient.test.tsx

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,8 @@ describe('SplitClient', () => {
121121
return null;
122122
}}
123123
</SplitClient>
124-
</SplitFactory>);
124+
</SplitFactory>
125+
);
125126

126127
act(() => (outerFactory as any).client('user2').__emitter__.emit(Event.SDK_READY_TIMED_OUT));
127128
act(() => (outerFactory as any).client('user2').__emitter__.emit(Event.SDK_READY_FROM_CACHE));
@@ -171,7 +172,8 @@ describe('SplitClient', () => {
171172
return null;
172173
}}
173174
</SplitClient>
174-
</SplitFactory>);
175+
</SplitFactory>
176+
);
175177

176178
act(() => (outerFactory as any).client('user2').__emitter__.emit(Event.SDK_READY_TIMED_OUT));
177179
act(() => (outerFactory as any).client('user2').__emitter__.emit(Event.SDK_READY));
@@ -216,7 +218,8 @@ describe('SplitClient', () => {
216218
return null;
217219
}}
218220
</SplitClient>
219-
</SplitFactory>);
221+
</SplitFactory>
222+
);
220223

221224
act(() => (outerFactory as any).client('user2').__emitter__.emit(Event.SDK_READY_TIMED_OUT));
222225
act(() => (outerFactory as any).client('user2').__emitter__.emit(Event.SDK_READY));
@@ -229,14 +232,16 @@ describe('SplitClient', () => {
229232

230233
const Component = () => {
231234
return (
232-
<SplitContext.Consumer>{(value) => {
233-
expect(value.client).toBe(outerFactory.client('user2'));
234-
expect(value.isReady).toBe(false);
235-
expect(value.isTimedout).toBe(false);
236-
expect(value.lastUpdate).toBe(0);
237-
done();
238-
return null;
239-
}}</SplitContext.Consumer>
235+
<SplitContext.Consumer>
236+
{(value) => {
237+
expect(value.client).toBe(outerFactory.client('user2'));
238+
expect(value.isReady).toBe(false);
239+
expect(value.isTimedout).toBe(false);
240+
expect(value.lastUpdate).toBe(0);
241+
done();
242+
return null;
243+
}}
244+
</SplitContext.Consumer>
240245
);
241246
};
242247

@@ -245,7 +250,8 @@ describe('SplitClient', () => {
245250
<SplitClient splitKey='user2' >
246251
<Component />
247252
</SplitClient>
248-
</SplitFactory>);
253+
</SplitFactory>
254+
);
249255
});
250256

251257
test('logs error and passes null client if rendered outside an SplitProvider component.', () => {
@@ -256,7 +262,8 @@ describe('SplitClient', () => {
256262
expect(client).toBe(null);
257263
return null;
258264
}}
259-
</SplitClient>);
265+
</SplitClient>
266+
);
260267
expect(errorSpy).toBeCalledWith(ERROR_SC_NO_FACTORY);
261268
});
262269

@@ -355,7 +362,8 @@ describe('SplitClient', () => {
355362
const wrapper = render(
356363
<SplitFactory factory={outerFactory} >
357364
<InnerComponent />
358-
</SplitFactory>);
365+
</SplitFactory>
366+
);
359367
});
360368

361369
test('attributes binding test with utility', (done) => {

src/__tests__/SplitContext.test.tsx

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,19 @@ import { SplitContext } from '../SplitContext';
66
* Test default SplitContext value
77
*/
88
test('SplitContext.Consumer shows default value', () => {
9-
render(<SplitContext.Consumer>{(value) => {
10-
expect(value.factory).toBe(null);
11-
expect(value.client).toBe(null);
12-
expect(value.isReady).toBe(false);
13-
expect(value.isReadyFromCache).toBe(false);
14-
expect(value.hasTimedout).toBe(false);
15-
expect(value.isTimedout).toBe(false);
16-
expect(value.isDestroyed).toBe(false);
17-
expect(value.lastUpdate).toBe(0);
18-
return null;
19-
}}</SplitContext.Consumer>);
9+
render(
10+
<SplitContext.Consumer>
11+
{(value) => {
12+
expect(value.factory).toBe(null);
13+
expect(value.client).toBe(null);
14+
expect(value.isReady).toBe(false);
15+
expect(value.isReadyFromCache).toBe(false);
16+
expect(value.hasTimedout).toBe(false);
17+
expect(value.isTimedout).toBe(false);
18+
expect(value.isDestroyed).toBe(false);
19+
expect(value.lastUpdate).toBe(0);
20+
return null;
21+
}}
22+
</SplitContext.Consumer>
23+
);
2024
});

src/__tests__/SplitFactory.test.tsx

Lines changed: 39 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ describe('SplitFactory', () => {
3434
expect((factory as SplitIO.ISDK).settings.version).toContain('react-');
3535
return null;
3636
}}
37-
</SplitFactory>);
37+
</SplitFactory>
38+
);
3839
});
3940

4041
test('passes ready props to the child if initialized with a ready factory.', async () => {
@@ -57,7 +58,8 @@ describe('SplitFactory', () => {
5758
expect((factory as SplitIO.ISDK).settings.version).toBe(outerFactory.settings.version);
5859
return null;
5960
}}
60-
</SplitFactory>);
61+
</SplitFactory>
62+
);
6163
});
6264

6365
test('rerenders child on SDK_READY_TIMEDOUT, SDK_READY_FROM_CACHE, SDK_READY and SDK_UPDATE events.', async () => {
@@ -95,7 +97,8 @@ describe('SplitFactory', () => {
9597
previousLastUpdate = lastUpdate;
9698
return null;
9799
}}
98-
</SplitFactory>);
100+
</SplitFactory>
101+
);
99102

100103
act(() => (outerFactory as any).client().__emitter__.emit(Event.SDK_READY_TIMED_OUT));
101104
act(() => (outerFactory as any).client().__emitter__.emit(Event.SDK_READY_FROM_CACHE));
@@ -137,7 +140,8 @@ describe('SplitFactory', () => {
137140
previousLastUpdate = lastUpdate;
138141
return null;
139142
}}
140-
</SplitFactory>);
143+
</SplitFactory>
144+
);
141145

142146
act(() => (outerFactory as any).client().__emitter__.emit(Event.SDK_READY_TIMED_OUT));
143147
act(() => (outerFactory as any).client().__emitter__.emit(Event.SDK_READY));
@@ -175,7 +179,8 @@ describe('SplitFactory', () => {
175179
previousLastUpdate = lastUpdate;
176180
return null;
177181
}}
178-
</SplitFactory>);
182+
</SplitFactory>
183+
);
179184

180185
act(() => (outerFactory as any).client().__emitter__.emit(Event.SDK_READY_TIMED_OUT));
181186
act(() => (outerFactory as any).client().__emitter__.emit(Event.SDK_READY));
@@ -186,22 +191,25 @@ describe('SplitFactory', () => {
186191
test('renders a passed JSX.Element with a new SplitContext value.', (done) => {
187192
const Component = () => {
188193
return (
189-
<SplitContext.Consumer>{(value) => {
190-
expect(value.factory).toBeInstanceOf(Object);
191-
expect(value.client).toBe(value.factory?.client());
192-
expect(value.isReady).toBe(false);
193-
expect(value.isTimedout).toBe(false);
194-
expect(value.lastUpdate).toBe(0);
195-
done();
196-
return null;
197-
}}</SplitContext.Consumer>
194+
<SplitContext.Consumer>
195+
{(value) => {
196+
expect(value.factory).toBeInstanceOf(Object);
197+
expect(value.client).toBe(value.factory?.client());
198+
expect(value.isReady).toBe(false);
199+
expect(value.isTimedout).toBe(false);
200+
expect(value.lastUpdate).toBe(0);
201+
done();
202+
return null;
203+
}}
204+
</SplitContext.Consumer>
198205
);
199206
};
200207

201208
render(
202209
<SplitFactory config={sdkBrowser} >
203210
<Component />
204-
</SplitFactory>);
211+
</SplitFactory>
212+
);
205213
});
206214

207215
test('logs warning if both a config and factory are passed as props.', () => {
@@ -213,7 +221,8 @@ describe('SplitFactory', () => {
213221
expect(factory).toBe(outerFactory);
214222
return null;
215223
}}
216-
</SplitFactory>);
224+
</SplitFactory>
225+
);
217226

218227
expect(logSpy).toBeCalledWith(WARN_SF_CONFIG_AND_FACTORY);
219228
logSpy.mockRestore();
@@ -227,7 +236,8 @@ describe('SplitFactory', () => {
227236
expect(factory).toBe(null);
228237
return null;
229238
}}
230-
</SplitFactory>);
239+
</SplitFactory>
240+
);
231241
expect(errorSpy).toBeCalledWith(ERROR_SF_NO_CONFIG_AND_FACTORY);
232242
});
233243

@@ -240,15 +250,16 @@ describe('SplitFactory', () => {
240250
expect(__factories.size).toBe(1);
241251
destroyMainClientSpy = jest.spyOn((factory as SplitIO.ISDK).client(), 'destroy');
242252
return (
243-
<SplitClient splitKey='other_key' >{
244-
({ client }) => {
253+
<SplitClient splitKey='other_key' >
254+
{({ client }) => {
245255
destroySharedClientSpy = jest.spyOn(client as SplitIO.IClient, 'destroy');
246256
return null;
247-
}
248-
}</SplitClient>
257+
}}
258+
</SplitClient>
249259
);
250260
}}
251-
</SplitFactory>);
261+
</SplitFactory>
262+
);
252263
wrapper.unmount();
253264
// the factory created by the component is removed from `factories` cache and its clients are destroyed
254265
expect(__factories.size).toBe(0);
@@ -267,15 +278,16 @@ describe('SplitFactory', () => {
267278
expect(__factories.size).toBe(0);
268279
destroyMainClientSpy = jest.spyOn((factory as SplitIO.ISDK).client(), 'destroy');
269280
return (
270-
<SplitClient splitKey='other_key' >{
271-
({ client }) => {
281+
<SplitClient splitKey='other_key' >
282+
{({ client }) => {
272283
destroySharedClientSpy = jest.spyOn(client as SplitIO.IClient, 'destroy');
273284
return null;
274-
}
275-
}</SplitClient>
285+
}}
286+
</SplitClient>
276287
);
277288
}}
278-
</SplitFactory>);
289+
</SplitFactory>
290+
);
279291
wrapper.unmount();
280292
expect(destroyMainClientSpy).not.toBeCalled();
281293
expect(destroySharedClientSpy).not.toBeCalled();

0 commit comments

Comments
 (0)