Merge pull request ryanbahniuk#17 from ryanbahniuk/2.1.1

2.1.1

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sassaby",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "A unit testing library for SASS",
   "keywords": ["sass", "scss", "testing", "unit testing", "bdd", "tdd", "test"],
   "author": "Ryan Bahniuk <ryan.bahniuk@gmail.com>",

src/mixinResult.js

@@ -36,11 +36,12 @@ function wrapOutput(type, css) {
 }
 
 function unwrapOutput(type, css) {
+  var unwrapped = css;
   if (type === 'included') {
-    return css.replace('.test{', '').replace('}', '');
-  } else {
-    return css;
+    unwrapped = unwrapped.replace(/^.test{/g, '').replace(/\}$/g, '');
   }
+
+  return unwrapped.replace(/;$/g, '');
 }
 
 function compileCss(file, type, call, args, block) {

test/fixtures/sample.scss

@@ -51,6 +51,12 @@
   @include make-align-right($label);
 }
 
+@mixin test-included-mixin-include {
+  .test {
+    @include appearance(none);
+  }
+}
+
 @mixin prefixer($prefix, $property, $value) {
   -#{$prefix}-#{$property}: $value;
 }

test/integrationTests.js

@@ -142,6 +142,21 @@ describe('sample.scss', function() {
     });
   });
 
+  describe('test-included-mixin-include', function() {
+    beforeEach(function() {
+      mixin = sassaby.standaloneMixin('test-included-mixin-include');
+      compiled = mixin.called();
+    });
+
+    it('should create the correct selector', function() {
+      compiled.createsSelector('.test');
+    });
+
+    it('should call the correct mixin', function() {
+      compiled.calls('appearance(none)');
+    });
+  });
+
   describe('animation', function() {
     beforeEach(function() {
       mixin = sassaby.includedMixin('animation');

test/mixinResultTests.js

@@ -27,7 +27,9 @@ describe('MixinResult', function() {
   var property = 'color';
   var value = 'red';
   var result = property + ':' + value;
+  var resultWithSemicolon = property + ':' + value + ';';
   var wrappedResult = selector + '{' + result + '}';
+  var wrappedResultWithSemicolon = selector + '{' + resultWithSemicolon + '}';
 
   var args = [1, 2, 'hello', true];
   var argString = '1, 2, hello, true';
@@ -135,7 +137,7 @@ describe('MixinResult', function() {
     });
 
     it('unwraps the included output', function() {
-      assert.equal(MixinResult.unwrapOutput('included', wrappedResult), result);
+      assert.equal(MixinResult.unwrapOutput('included', wrappedResultWithSemicolon), result);
     });
   });