Merge pull request #27 from jaridmargolin/master

Return Object on Cocktail.mixin()
onsi · Feb 17, 2014 · 3ebb1af · 3ebb1af
2 parents 2100b42 + ceb42b9
commit 3ebb1af
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
-.DS_Store
+.DS_Store
+bower_components
diff --git a/Cocktail.js b/Cocktail.js
@@ -1,4 +1,4 @@
-//     Cocktail.js 0.3.0
+//     Cocktail.js 0.5.3
 //     (c) 2012 Onsi Fakhouri
 //     Cocktail.js may be freely distributed under the MIT license.
 //     http://github.com/onsi/cocktail
@@ -63,6 +63,8 @@
                 return returnValue;
             };
         });
+
+        return klass;
     };
 
     var originalExtend;

diff --git a/Cocktail.min.js b/Cocktail.min.js
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "backbone.cocktail",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "homepage": "https://github.com/onsi/cocktail",
   "authors": [
     "Onsi Fakhouri <[email protected]>"

diff --git a/spec/spec/CocktailSpec.js b/spec/spec/CocktailSpec.js
@@ -198,6 +198,14 @@ describe('Cocktail', function() {
             var view = new ViewClass();
             expect(_.isArray(view.sampleArray)).toBeTruthy();
         });
+
+        it('should return the result mixed object', function () {
+            var A = { b: 'c' },
+                D = { e: 'f' };
+
+            var result = Cocktail.mixin(A, D);
+            expect(Cocktail.mixin(A, D) == A).toBeTruthy();
+        });
     });
 
     describe('when patching backbone', function() {