fix: override arrays when merging user configuration

* add integration tests for getConfiguration
* improve test for presence of user config
* override arrays when merging user config by using mergeWith

fixes #11

Author: marionebl

.conventional-changelog-lintrc

@@ -0,0 +1,5 @@
+{
+  "rules": {
+    "type-enum": [ 2, "always", [ "Fix", "New", "Breaking", "Docs", "Build", "Upgrade", "Chore", "Update" ] ]
+  }
+}

fixtures/empty-file/.conventional-changelog-lintrc

@@ -0,0 +1 @@
+{}

fixtures/empty-object-file/.conventional-changelog-lintrc

@@ -0,0 +1,3 @@
+{
+  "extends": []
+}

fixtures/extends-empty/.conventional-changelog-lintrc

@@ -0,0 +1,3 @@
+{
+  "extends": ["____foooooo"]
+}

fixtures/extends-invalid/.conventional-changelog-lintrc

@@ -0,0 +1,5 @@
+{
+  "rules": {
+    "type-enum": [ 2, "always", [ "a", "b", "c", "d" ]]
+  }
+}

fixtures/overridden-extended-type-enums/.conventional-changelog-lintrc

@@ -0,0 +1,6 @@
+{
+  "extends": ["angular"],
+  "rules": {
+    "type-enum": [ 2, "always", [ "a", "b", "c", "d" ]]
+  }
+}

fixtures/overridden-type-enums/.conventional-changelog-lintrc

@@ -1,4 +1,4 @@
-import {merge, pick} from 'lodash';
+import {omit, merge, mergeWith, pick} from 'lodash';
 import rc from 'rc';
 
 import resolveExtends from './resolve-extends';
@@ -16,21 +16,23 @@ const defaultSettings = {
 
 export default async (name = defaultName, settings = defaultSettings, seed = {}) => {
 	// Obtain config from .rc files
-	const userConfig = rc(name, settings.defaults);
+	const userConfig = omit(rc(name, settings.defaults), '_');
 
-	// Use the default extends config if there is no userConfig
+	// Use the default extends config if there is no userConfig file found
 	// See https://git.io/vwT1C for reference
-	const applicableDefaults = Object.keys(userConfig) > 0 ?
-		{} :
-		defaults;
+	const applicableDefaults = userConfig.config ? {} : defaults;
 
 	// Merge passed config with file based options
 	const config = merge(userConfig, seed);
 	const opts = merge({}, applicableDefaults, pick(config, 'extends'));
 
 	// Resolve extends key
 	const extended = resolveExtends(opts, settings.prefix);
-	const preset = merge({}, extended, config);
+	const preset = mergeWith({}, extended, config, (a, b) => {
+		if (Array.isArray(b)) {
+			return b;
+		}
+	});
 
 	// Execute rule config functions if needed
 	const executed = await Promise.all(['rules', 'wildcards']

source/library/get-configuration.js

@@ -0,0 +1,54 @@
+import path from 'path';
+import test from 'ava';
+import expect from 'unexpected';
+
+import getConfiguration from '../../source/library/get-configuration';
+
+const cwd = process.cwd();
+
+test('overridden-type-enums should return the exact type-enum', async t => {
+	const back = chdir('fixtures/overridden-type-enums');
+	const actual = await getConfiguration();
+	expect(actual.rules['type-enum'][2], 'to equal', [ "a", "b", "c", "d" ]);
+	back();
+});
+
+test('overridden-extended-type-enums should return the exact type-enum', async t => {
+	const back = chdir('fixtures/overridden-extended-type-enums');
+	const actual = await getConfiguration();
+	expect(actual.rules['type-enum'][2], 'to equal', [ "a", "b", "c", "d" ]);
+	back();
+});
+
+test('extends-empty should have no rules', async t => {
+	const back = chdir('fixtures/extends-empty');
+	const actual = await getConfiguration();
+	expect(actual.rules, 'to equal', {});
+	back();
+});
+
+test('invalid extend should throw', async t => {
+	const back = chdir('fixtures/extends-invalid');
+	t.throws(getConfiguration(), Error);
+	back();
+});
+
+test('empty file should have no rules', async t => {
+	const back = chdir('fixtures/empty-object-file');
+	const actual = await getConfiguration();
+	expect(actual.rules, 'to equal', {});
+	back();
+});
+
+test('empty file should extend angular', async t => {
+	const back = chdir('fixtures/empty-file');
+	const actual = await getConfiguration();
+	expect(actual.extends, 'to equal', ['angular']);
+	back();
+});
+
+function chdir(target) {
+	const to = path.resolve(cwd, target.split('/').join(path.sep));
+	process.chdir(to);
+	return () => process.chdir(cwd);
+}