sass 3.1.0.alpha.27 → 3.1.0.alpha.28

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-3.1.0.alpha.27
+3.1.0.alpha.28

data/VERSION

@@ -1 +1 @@
-3.1.0.alpha.27
+3.1.0.alpha.28

data/lib/sass/tree/media_node.rb

@@ -60,6 +60,9 @@ module Sass::Tree
       new_rule = parent.dup
       new_rule.children = self.children
       self.children = Array(new_rule.cssize(extends, self))
+      # If the last child is actually the end of the group,
+      # the parent's cssize will set it properly
+      self.children.last.group_end = false unless self.children.empty?
     end
 
     # @see Node#to_s

data/test/sass/engine_test.rb

@@ -2374,7 +2374,19 @@ SASS
   end
 
   def test_nested_media_around_properties
-    sass_str = <<SASS
+    assert_equal <<CSS, render(<<SASS)
+.outside {
+  color: red;
+  background: blue; }
+  @media print {
+    .outside {
+      color: black; } }
+    @media print and nested {
+      .outside .inside {
+        border: 1px solid black; } }
+  .outside .middle {
+    display: block; }
+CSS
 .outside
   color: red
   @media print
@@ -2386,24 +2398,6 @@ SASS
   .middle
     display: block
 SASS
-    css_str = <<CSS
-.outside {
-  color: red; }
-
-@media print {
-  .outside {
-    color: black; } }
-
-@media (print) and (nested) {
-  .outside .inside {
-    border: 1px solid black; } }
-
-.outside {
-  background: blue; }
-  .outside .middle {
-    display: block; }
-CSS
-    assert_equal css_str, render(sass_str)
   end
 
   def test_media_with_parent_references

data/test/sass/scss/scss_test.rb

@@ -1175,60 +1175,4 @@ b {
 SCSS
 
   end
-  def test_nested_media_around_properties
-    scss_str = <<SCSS
-.outside {
-  color: red;
-  @media print {
-    color: black;
-    .inside {
-      @media nested {
-        border: 1px solid black;
-      }
-    }
-  }
-  background: blue;
-  .middle {
-    display: block;
-  }
-}
-SCSS
-    css_str = <<CSS
-.outside {
-  color: red; }
-
-@media print {
-  .outside {
-    color: black; } }
-
-@media (print) and (nested) {
-  .outside .inside {
-    border: 1px solid black; } }
-
-.outside {
-  background: blue; }
-  .outside .middle {
-    display: block; }
-CSS
-    assert_equal css_str, render(scss_str)
-  end
-
-  def test_media_with_parent_references
-    scss_str = <<SCSS
-.outside {
-  @media print {
-    &.inside {
-      border: 1px solid black;
-    }
-  }
-}
-SCSS
-    css_str = <<CSS
-@media print {
-  .outside.inside {
-    border: 1px solid black; } }
-CSS
-    assert_equal css_str, render(scss_str)
-  end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  version: 3.1.0.alpha.27
+  version: 3.1.0.alpha.28
 platform: ruby
 authors: 
 - Nathan Weizenbaum