Merge a6147c6 into 787575f

janis-commerce · May 28, 2020 · e55b23f · e55b23f
2 parents 787575f + a6147c6
commit e55b23f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/get-setting-api.js b/lib/get-setting-api.js
@@ -32,7 +32,7 @@ module.exports = class GetSettingApi extends API {
 		const settingsFormatted = {};
 
 		Object.entries(defaultSettings).forEach(([settingName, setting]) => {
-			settingsFormatted[settingName] = (clientSettings.values && typeof clientSettings.values[settingName] !== 'undefined')
+			settingsFormatted[settingName] = (clientSettings && clientSettings.values && typeof clientSettings.values[settingName] !== 'undefined')
 				? clientSettings.values[settingName]
 				: setting.default;
 		});

diff --git a/tests/get-setting-api.js b/tests/get-setting-api.js
@@ -75,7 +75,7 @@ describe('Setting Api Get Tests', () => {
 			before: sandbox => {
 				mockRequire(defaultDefinitionPath, settingsDefinition);
 				sandbox.stub(ClientSettingsModel.prototype, 'getBy');
-				ClientSettingsModel.prototype.getBy.resolves({});
+				ClientSettingsModel.prototype.getBy.resolves(null);
 			},
 			request: { pathParameters: ['sample-entity'] },
 			session: true,