TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-25 20:03:12 +03:00
Code Issues Projects Releases Wiki Activity

Removed unused adapterType variable

Browse Source 
refs https://github.com/TryGhost/Toolbox/issues/384

- The adapter manager can parse the adapter type internally from the "type:feature" syntax, so there's no need to pass it around.
This commit is contained in:
Naz 2022-09-06 15:36:46 +08:00
parent 1fc8c8d671
commit 67df9a6105
No known key found for this signature in database
2 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ghost/core/core/server/services/adapter-manager/options-resolver.js
View File

@ -24,5 +24,5 @@ module.exports = function resolveAdapterOptions(name, adapterServiceConfig) {
adapterConfig = adapterSettings[adapterName];
}
return {adapterType, adapterName, adapterConfig};
return {adapterName, adapterConfig};
};

27
ghost/core/test/unit/server/services/adapter-manager/options-resolver.test.js
View File

@ -12,9 +12,8 @@ describe('Adapter Manager: options resolver', function () {
}
};
const {adapterType, adapterName, adapterConfig} = resolveAdapterOptions(name, adapterServiceConfig);
const {adapterName, adapterConfig} = resolveAdapterOptions(name, adapterServiceConfig);
adapterType.should.equal('cache');
adapterName.should.equal('Memory');
should.equal(adapterConfig, undefined);
});
@ -30,9 +29,8 @@ describe('Adapter Manager: options resolver', function () {
}
};
const {adapterType, adapterName, adapterConfig} = resolveAdapterOptions(name, adapterServiceConfig);
const {adapterName, adapterConfig} = resolveAdapterOptions(name, adapterServiceConfig);
adapterType.should.equal('storage');
adapterName.should.equal('cloud-storage');
adapterConfig.should.deepEqual({
custom: 'configValue'
@ -54,9 +52,8 @@ describe('Adapter Manager: options resolver', function () {
}
};
const {adapterType, adapterName, adapterConfig} = resolveAdapterOptions(name, adapterServiceConfig);
const {adapterName, adapterConfig} = resolveAdapterOptions(name, adapterServiceConfig);
adapterType.should.equal('storage');
adapterName.should.equal('local-storage');
adapterConfig.should.deepEqual({
custom: 'localStorageConfig'
@ -79,9 +76,8 @@ describe('Adapter Manager: options resolver', function () {
}
};
const {adapterType, adapterName, adapterConfig} = resolveAdapterOptions(name, adapterServiceConfig);
const {adapterName, adapterConfig} = resolveAdapterOptions(name, adapterServiceConfig);
adapterType.should.equal('storage');
adapterName.should.equal('cloud-storage');
adapterConfig.should.deepEqual({
custom: 'configValue'
@ -107,18 +103,16 @@ describe('Adapter Manager: options resolver', function () {
}
};
const {adapterType, adapterName, adapterConfig} = resolveAdapterOptions(primaryAdapterName, adapterServiceConfig);
const {adapterName, adapterConfig} = resolveAdapterOptions(primaryAdapterName, adapterServiceConfig);
adapterType.should.equal('cache');
adapterName.should.equal('Redis');
adapterConfig.should.deepEqual({
commonConfigValue: 'common_config_value',
adapterConfigValue: 'images_redis_value'
});
const {adapterType: secondAdapterType, adapterName: secondAdapterName, adapterConfig: secondAdapterConfig} = resolveAdapterOptions(secondaryAdapterName, adapterServiceConfig);
const {adapterName: secondAdapterName, adapterConfig: secondAdapterConfig} = resolveAdapterOptions(secondaryAdapterName, adapterServiceConfig);
secondAdapterType.should.equal('cache');
secondAdapterName.should.equal('Redis');
secondAdapterConfig.should.deepEqual({
commonConfigValue: 'common_config_value',
@ -142,17 +136,15 @@ describe('Adapter Manager: options resolver', function () {
}
};
const {adapterType, adapterName, adapterConfig} = resolveAdapterOptions(primaryAdapterName, adapterServiceConfig);
const {adapterName, adapterConfig} = resolveAdapterOptions(primaryAdapterName, adapterServiceConfig);
adapterType.should.equal('cache');
adapterName.should.equal('Redis');
adapterConfig.should.deepEqual({
adapterConfigValue: 'images_redis_value'
});
const {adapterType: secondAdapterType, adapterName: secondAdapterName, adapterConfig: secondAdapterConfig} = resolveAdapterOptions(secondaryAdapterName, adapterServiceConfig);
const {adapterName: secondAdapterName, adapterConfig: secondAdapterConfig} = resolveAdapterOptions(secondaryAdapterName, adapterServiceConfig);
secondAdapterType.should.equal('cache');
secondAdapterName.should.equal('Redis');
secondAdapterConfig.should.deepEqual({
adapterConfigValue: 'settings_redis_value'
@ -175,9 +167,8 @@ describe('Adapter Manager: options resolver', function () {
}
};
const {adapterType, adapterName, adapterConfig} = resolveAdapterOptions(primaryAdapterName, adapterServiceConfig);
const {adapterName, adapterConfig} = resolveAdapterOptions(primaryAdapterName, adapterServiceConfig);
adapterType.should.equal('cache');
adapterName.should.equal('Redis');
adapterConfig.should.deepEqual({
commonConfigValue: 'common_config_value',