feat: reformatted-tests-handling-new-structure

Author: Zaimwa9

sdk/index.ts

@@ -4,7 +4,7 @@ import { buildEnvironmentModel } from '../flagsmith-engine/environments/util.js'
 
 import { ANALYTICS_ENDPOINT, AnalyticsProcessor } from './analytics.js';
 import { BaseOfflineHandler } from './offline_handlers.js';
-import { FlagsmithAPIError } from './errors.js';
+import { FlagsmithAPIError, FlagsmithClientError } from './errors.js';
 
 import { DefaultFlag, Flags } from './models.js';
 import { EnvironmentDataPollingManager } from './polling_manager.js';
@@ -279,6 +279,9 @@ export class Flagsmith {
         );
 
         const context = getEvaluationContext(environment, identityModel);
+        if (!context) {
+            throw new FlagsmithClientError('Local evaluation required to obtain identity segments');
+        }
         const evaluationResult = getEvaluationResult(context);
 
         return SegmentModel.fromSegmentResult(evaluationResult.segments, context);
@@ -401,6 +404,9 @@ export class Flagsmith {
     private async getEnvironmentFlagsFromDocument(): Promise<Flags> {
         const environment = await this.getEnvironment();
         const context = getEvaluationContext(environment);
+        if (!context) {
+            throw new FlagsmithClientError('Unable to get flags. No environment present.');
+        }
         const evaluationResult = getEvaluationResult(context);
         const flags = Flags.fromEvaluationResult(evaluationResult);
 
@@ -426,6 +432,9 @@ export class Flagsmith {
         );
 
         const context = getEvaluationContext(environment, identityModel);
+        if (!context) {
+            throw new FlagsmithClientError('Unable to get flags. No environment present.');
+        }
         const evaluationResult = getEvaluationResult(context);
 
         const flags = Flags.fromEvaluationResult(

tests/engine/e2e/engine.test.ts

@@ -24,9 +24,11 @@ test('Test Engine', () => {
         const sortedEngineFlags = flags
             .allFlags()
             .sort((a, b) => (a.featureName > b.featureName ? 1 : -1));
-        const sortedAPIFlags = testCase.response['flags'].sort((a: any, b: any) =>
+
+        const expectedFlags = testCase.response['flags'] || {};
+        const sortedAPIFlags = Object.values(expectedFlags).sort((a: any, b: any) =>
             a.name > b.name ? 1 : -1
-        );
+        ) as Flags[];
 
         expect(sortedEngineFlags.length).toBe(sortedAPIFlags.length);
 

tests/engine/engine-tests/engine-test-data

@@ -18,8 +18,7 @@ import {
     EvaluationContext,
     InSegmentCondition,
     SegmentCondition,
-    SegmentCondition1,
-    SegmentContext
+    SegmentCondition1
 } from '../../../../flagsmith-engine/evaluation/models.js';
 
 // todo: work out how to implement this in a test function or before hook