fix(formlyConfig): fix defaultOptions override behavior (#680)

seibs · Kent C. Dodds · commit a4c54bbd5b8a · 2016-05-15T11:58:42.000-06:00
Fix the override behavior when the extended type's defaultOptions field is defined as a function. Closes #635
diff --git a/src/providers/formlyConfig.js b/src/providers/formlyConfig.js
@@ -124,7 +124,7 @@ function formlyConfig(formlyUsabilityProvider, formlyErrorAndWarningsUrlPrefix,
     if (!angular.isDefined(extendsDO)) {
       return
     }
-    const optionsDO = options.defaultOptions
+    const optionsDO = options.defaultOptions || {}
     const optionsDOIsFn = angular.isFunction(optionsDO)
     const extendsDOIsFn = angular.isFunction(extendsDO)
     if (extendsDOIsFn) {
@@ -136,8 +136,8 @@ function formlyConfig(formlyUsabilityProvider, formlyErrorAndWarningsUrlPrefix,
         if (optionsDOIsFn) {
           extenderOptionsDefaultOptions = extenderOptionsDefaultOptions(mergedDefaultOptions, scope)
         }
-        utils.reverseDeepMerge(extendsDefaultOptions, extenderOptionsDefaultOptions)
-        return extendsDefaultOptions
+        utils.reverseDeepMerge(extenderOptionsDefaultOptions, extendsDefaultOptions)
+        return extenderOptionsDefaultOptions
       }
     } else if (optionsDOIsFn) {
       options.defaultOptions = function defaultOptions(opts, scope) {
diff --git a/src/providers/formlyConfig.test.js b/src/providers/formlyConfig.test.js
@@ -287,6 +287,68 @@ describe('formlyConfig', () => {
           })
 
         })
+        
+        describe(`abstractType function case`, () => {
+          beforeEach(() => {
+            setterFn([
+              {
+                name,
+                template,
+                defaultOptions: function(options) {
+                  return {
+                    templateOptions: {
+                      required: true,
+                      min: 3,
+                    },
+                  }
+                },
+              },
+              {
+                name: 'type2',
+                extends: name,
+                defaultOptions: function(options) {
+                  return {
+                    templateOptions: {
+                      required: false,
+                      max: 4,
+                    },
+                  }
+                },
+              },
+              {
+                name: 'type3',
+                extends: name,
+                defaultOptions: {
+                  templateOptions: {
+                    required: false,
+                    max: 4,
+                  },
+                },
+              },
+            ])
+          })
+
+          it(`should merge options when extending defaultOptions is a function`, () => {
+            expect(getterFn('type2').defaultOptions({})).to.eql({
+              templateOptions: {
+                required: false,
+                min: 3,
+                max: 4,
+              },
+            })
+          })
+          
+          it(`should merge options when extending defaultOptions is an object`, () => {
+            expect(getterFn('type3').defaultOptions({})).to.eql({
+              templateOptions: {
+                required: false,
+                min: 3,
+                max: 4,
+              },
+            })
+          })
+
+        })
 
         describe(`template/templateUrl Cases`, () => {
           it('should use templateUrl if type defines it and its parent has template defined', function() {

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ function formlyConfig(formlyUsabilityProvider, formlyErrorAndWarningsUrlPrefix,`
`124`	`124`	`if (!angular.isDefined(extendsDO)) {`
`125`	`125`	`return`
`126`	`126`	`}`
`127`		`- const optionsDO = options.defaultOptions`
	`127`	`+ const optionsDO = options.defaultOptions \|\| {}`
`128`	`128`	`const optionsDOIsFn = angular.isFunction(optionsDO)`
`129`	`129`	`const extendsDOIsFn = angular.isFunction(extendsDO)`
`130`	`130`	`if (extendsDOIsFn) {`
`@@ -136,8 +136,8 @@ function formlyConfig(formlyUsabilityProvider, formlyErrorAndWarningsUrlPrefix,`
`136`	`136`	`if (optionsDOIsFn) {`
`137`	`137`	`extenderOptionsDefaultOptions = extenderOptionsDefaultOptions(mergedDefaultOptions, scope)`
`138`	`138`	`}`
`139`		`- utils.reverseDeepMerge(extendsDefaultOptions, extenderOptionsDefaultOptions)`
`140`		`- return extendsDefaultOptions`
	`139`	`+ utils.reverseDeepMerge(extenderOptionsDefaultOptions, extendsDefaultOptions)`
	`140`	`+ return extenderOptionsDefaultOptions`
`141`	`141`	`}`
`142`	`142`	`} else if (optionsDOIsFn) {`
`143`	`143`	`options.defaultOptions = function defaultOptions(opts, scope) {`