@@ -11,6 +11,7 @@ import { defaultAmazonQLspConfig, ExtendedAmazonQLSPConfig, getAmazonQLspConfig
1111describe ( 'getAmazonQLspConfig' , ( ) => {
1212 let sandbox : sinon . SinonSandbox
1313 let serviceConfigStub : sinon . SinonStub
14+ let getStub : sinon . SinonStub
1415 const settingConfig : ExtendedAmazonQLSPConfig = {
1516 manifestUrl : 'https://custom.url/manifest.json' ,
1617 supportedVersions : '4.0.0' ,
@@ -24,8 +25,10 @@ describe('getAmazonQLspConfig', () => {
2425 sandbox = sinon . createSandbox ( )
2526
2627 serviceConfigStub = sandbox . stub ( )
28+ getStub = sandbox . stub ( )
2729 sandbox . stub ( DevSettings , 'instance' ) . get ( ( ) => ( {
2830 getServiceConfig : serviceConfigStub ,
31+ get : getStub ,
2932 } ) )
3033 } )
3134
@@ -36,29 +39,45 @@ describe('getAmazonQLspConfig', () => {
3639
3740 it ( 'uses default config' , ( ) => {
3841 serviceConfigStub . returns ( { } )
39- assert . deepStrictEqual ( getAmazonQLspConfig ( ) , defaultAmazonQLspConfig )
42+ getStub . returns ( { } )
43+ assert . deepStrictEqual ( getAmazonQLspConfig ( ) , { ...defaultAmazonQLspConfig , registryUrl : undefined } )
4044 } )
4145
4246 it ( 'overrides path' , ( ) => {
4347 const path = '/custom/path/to/lsp'
4448 serviceConfigStub . returns ( { path } )
49+ getStub . returns ( { } )
4550
4651 assert . deepStrictEqual ( getAmazonQLspConfig ( ) , {
4752 ...defaultAmazonQLspConfig ,
4853 path,
54+ registryUrl : undefined ,
4955 } )
5056 } )
5157
5258 it ( 'overrides default settings' , ( ) => {
5359 serviceConfigStub . returns ( settingConfig )
60+ getStub . returns ( { } )
5461
55- assert . deepStrictEqual ( getAmazonQLspConfig ( ) , settingConfig )
62+ assert . deepStrictEqual ( getAmazonQLspConfig ( ) , { ... settingConfig , registryUrl : undefined } )
5663 } )
5764
5865 it ( 'environment variable takes precedence over settings' , ( ) => {
5966 setEnv ( settingConfig )
6067 serviceConfigStub . returns ( { } )
61- assert . deepStrictEqual ( getAmazonQLspConfig ( ) , settingConfig )
68+ getStub . returns ( { } )
69+ assert . deepStrictEqual ( getAmazonQLspConfig ( ) , { ...settingConfig , registryUrl : undefined } )
70+ } )
71+
72+ it ( 'includes registryUrl from amazonqRegistry setting' , ( ) => {
73+ const registryUrl = 'https://custom.registry.url/manifest.json'
74+ serviceConfigStub . returns ( { } )
75+ getStub . withArgs ( 'amazonqRegistry' , { } ) . returns ( { registryUrl } )
76+
77+ assert . deepStrictEqual ( getAmazonQLspConfig ( ) , {
78+ ...defaultAmazonQLspConfig ,
79+ registryUrl,
80+ } )
6281 } )
6382
6483 function setEnv ( envConfig : ExtendedAmazonQLSPConfig ) {
0 commit comments