File tree Expand file tree Collapse file tree 2 files changed +17
-5
lines changed Expand file tree Collapse file tree 2 files changed +17
-5
lines changed Original file line number Diff line number Diff line change @@ -64,18 +64,17 @@ const discoverEnvironment = async (): Promise<IEnvironment> => {
64
64
}
65
65
66
66
const _resolveEnvironment : EnvironmentProvider = async ( ) : Promise < IEnvironment > => {
67
- console . log ( 'resolvingenvion' )
68
67
if ( environment ) {
69
68
return environment ;
70
69
}
71
70
72
- let detectedEnvironment = undefined ;
73
71
if ( config . environmentOverride ) {
74
- detectedEnvironment = getEnvironmentFromOverride ( ) ;
72
+ LOG ( "Environment override supplied" , config . environmentOverride ) ;
73
+ environment = getEnvironmentFromOverride ( ) ;
74
+ return environment ;
75
75
}
76
76
77
- detectedEnvironment = await discoverEnvironment ( ) ;
78
- environment = detectedEnvironment ; // eslint-disable-line require-atomic-updates
77
+ environment = await discoverEnvironment ( ) ; // eslint-disable-line require-atomic-updates
79
78
return environment ;
80
79
} ;
81
80
Original file line number Diff line number Diff line change 1
1
import * as faker from 'faker' ;
2
2
import { cleanResolveEnvironment } from '../EnvironmentDetector' ;
3
+ import config from '../../config/Configuration' ;
4
+ import Environments from '../Environments' ;
3
5
4
6
beforeEach ( ( ) => {
5
7
process . env = { } ;
@@ -24,3 +26,14 @@ test('resolveEnvironment() returns DefaultEnvironment if nothing else was detect
24
26
// assert
25
27
expect ( result . constructor . name ) . toBe ( 'DefaultEnvironment' ) ;
26
28
} , 10000 ) ;
29
+
30
+ test ( 'resolveEnvironment() honors configured override' , async ( ) => {
31
+ // arrange
32
+ config . environmentOverride = Environments . Local ;
33
+
34
+ // act
35
+ const result = await cleanResolveEnvironment ( ) ;
36
+
37
+ // assert
38
+ expect ( result . constructor . name ) . toBe ( 'LocalEnvironment' ) ;
39
+ } ) ;
You can’t perform that action at this time.
0 commit comments