presets can be object

frux · Oct 12, 2017 · 6c0ec49 · 6c0ec49
1 parent 4d9adc5
commit 6c0ec49
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/index.js b/index.js
@@ -71,7 +71,9 @@ function csp(params) {
 	}, {});
 
 	if (params.presets) {
-		params.presets.forEach(preset => {
+		// Object.keys also works with array keys
+		Object.keys(params.presets).forEach(key => {
+			const preset = params.presets[key];
 			let presetPolicies;
 
 			if (typeof preset === 'string') {

diff --git a/test/index.test.js b/test/index.test.js
@@ -72,6 +72,16 @@ test('Presets | extend', t => {
 	t.is(actual, 'script-src test.com; style-src test.com;');
 });
 
+test('Presets | object', t => {
+	const actual = csp({
+		presets: {
+			test: require('./fixtures/presets/csp-preset-test')
+		}
+	});
+
+	t.is(actual, 'script-src test.com; style-src test.com;');
+});
+
 test('Presets | resolve', t => {
 	t.is(csp.resolvePreset('csp-preset-test'), 'csp-preset-test');
 	t.is(csp.resolvePreset('test'), 'csp-preset-test');