Skip to content

Commit 30fe70c

Browse files
committed
Fix client configuration and tests.
1 parent 511c58a commit 30fe70c

File tree

3 files changed

+16
-11
lines changed

3 files changed

+16
-11
lines changed

packages/sdk/react-native/__tests__/fromExternal/react-native-sse/EventSource.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ describe('EventSource', () => {
102102
jest.runAllTimers();
103103
// This forces it to reconnect.
104104
// @ts-ignore
105-
eventSource.tryConnect();
105+
eventSource._tryConnect();
106106
jest.runAllTimers();
107107

108108
expect(logger.debug).toHaveBeenNthCalledWith(

packages/shared/sdk-client/__tests__/LDClientImpl.events.test.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ describe('sdk-client object', () => {
109109
expect.objectContaining<InputIdentifyEvent>({
110110
kind: 'identify',
111111
context: expect.objectContaining({
112-
contexts: expect.objectContaining({
112+
_contexts: expect.objectContaining({
113113
car: { key: 'test-car' },
114114
}),
115115
}),
@@ -130,7 +130,7 @@ describe('sdk-client object', () => {
130130
kind: 'custom',
131131
key: 'the-event',
132132
context: expect.objectContaining({
133-
contexts: expect.objectContaining({
133+
_contexts: expect.objectContaining({
134134
car: { key: 'test-car' },
135135
}),
136136
}),
@@ -153,7 +153,7 @@ describe('sdk-client object', () => {
153153
kind: 'custom',
154154
key: 'the-event',
155155
context: expect.objectContaining({
156-
contexts: expect.objectContaining({
156+
_contexts: expect.objectContaining({
157157
car: { key: 'test-car' },
158158
}),
159159
}),
@@ -176,7 +176,7 @@ describe('sdk-client object', () => {
176176
kind: 'custom',
177177
key: 'the-event',
178178
context: expect.objectContaining({
179-
contexts: expect.objectContaining({
179+
_contexts: expect.objectContaining({
180180
car: { key: 'test-car' },
181181
}),
182182
}),

packages/shared/sdk-client/src/configuration/Configuration.ts

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,14 @@ function ensureSafeLogger(logger?: LDLogger): LDLogger {
7171
export default class ConfigurationImpl implements Configuration {
7272
public readonly logger: LDLogger = createSafeLogger();
7373

74-
private readonly _baseUri = DEFAULT_POLLING;
75-
private readonly _eventsUri = ServiceEndpoints.DEFAULT_EVENTS;
76-
private readonly _streamUri = DEFAULT_STREAM;
74+
// Naming conventions is not followed for these lines because the config validation
75+
// accesses members based on the keys of the options.
76+
// eslint-disable-next-line @typescript-eslint/naming-convention
77+
private readonly baseUri = DEFAULT_POLLING;
78+
// eslint-disable-next-line @typescript-eslint/naming-convention
79+
private readonly eventsUri = ServiceEndpoints.DEFAULT_EVENTS;
80+
// eslint-disable-next-line @typescript-eslint/naming-convention
81+
private readonly streamUri = DEFAULT_STREAM;
7782

7883
public readonly maxCachedContexts = 5;
7984

@@ -130,9 +135,9 @@ export default class ConfigurationImpl implements Configuration {
130135
errors.forEach((e: string) => this.logger.warn(e));
131136

132137
this.serviceEndpoints = new ServiceEndpoints(
133-
this._streamUri,
134-
this._baseUri,
135-
this._eventsUri,
138+
this.streamUri,
139+
this.baseUri,
140+
this.eventsUri,
136141
internalOptions.analyticsEventPath,
137142
internalOptions.diagnosticEventPath,
138143
internalOptions.includeAuthorizationHeader,

0 commit comments

Comments
 (0)