Merge branch 'dev-master' into dev-3.x

yui · Sep 16, 2014 · 61fe90c · 61fe90c
2 parents 1fa12ad + a513932
commit 61fe90c
Showing 1 changed file with 21 additions and 0 deletions.
diff --git a/src/loader/tests/unit/assets/loader-tests.js b/src/loader/tests/unit/assets/loader-tests.js
@@ -334,6 +334,27 @@ YUI.add('loader-tests', function(Y) {
             Assert.isArray(url.match(/3.5.0\/foogg\/foogg-min\.js/), 'Group match should be combo-loaded with the default URL');
             Assert.isArray(url.match(/3.5.0\/cookie\/cookie-min\.js/), 'Default match should combo-load with the group result');
         },
+        'test inherited combine false with groups': function () {
+            var loader = new testY.Loader({
+                combine: false,
+                groups: {
+                    mods: {
+                        modules: {
+                            'mods-actioninfos': {
+                                path: 'actioninfos/actioninfos.js'
+                            },
+                            'mods-test': {
+                                path: 'test/test.js'
+                            }
+                        }
+                    }
+                },
+                require: ['mods-actioninfos', 'mods-test']
+            });
+
+            var out = loader.resolve(true);
+            Assert.areEqual(2, out.js.length, 'The loader should not have combined the modules within the group.');
+        },
         test_resolve_maxurl_length: function() {
             var loader = new testY.Loader({
                 maxURLLength: 1024,