feat(config): make us of mergeAttributes

Kronos-Integration · Sep 12, 2016 · 1955079 · 1955079
1 parent 7bcd7f0
commit 1955079
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/lib/LimitingInterceptor.js b/lib/LimitingInterceptor.js
@@ -27,7 +27,7 @@ class LimitingInterceptor extends Interceptor {
 	}
 
 	static get configurationAttributes() {
-		return Object.assign(mat.createAttributes({
+		return mat.mergeAttributes(mat.createAttributes({
 			limits: {
 				default: [{
 					count: 10

diff --git a/lib/TimeoutInterceptor.js b/lib/TimeoutInterceptor.js
@@ -11,7 +11,7 @@ const Interceptor = require('./interceptor').Interceptor,
 class TimeoutInterceptor extends Interceptor {
 
 	static get configurationAttributes() {
-		return Object.assign(mat.createAttributes({
+		return mat.mergeAttributes(mat.createAttributes({
 			timeout: {
 				description: 'request timeout',
 				default: 1,

diff --git a/package.json b/package.json
@@ -20,7 +20,7 @@
   },
   "homepage": "https://github.com/Kronos-Integration/kronos-interceptor#readme",
   "dependencies": {
-    "model-attributes": "^1.7.1"
+    "model-attributes": "^1.7.2"
   },
   "devDependencies": {
     "chai": "3.5.0",