sass 3.4.0 → 3.4.25

data/test/sass/css2sass_test.rb

@@ -14,7 +14,7 @@ CSS
 h1
   color: red
 SASS
-    assert_equal(<<SASS, css2sass(css, :old => true))
+    silence_warnings {assert_equal(<<SASS, css2sass(css, :old => true))}
 h1
   :color red
 SASS
@@ -24,10 +24,13 @@ SASS
     assert_equal(<<SASS, css2sass(<<CSS))
 li
   display: none
+
   a
     text-decoration: none
+
     span
       color: yellow
+
     &:hover
       text-decoration: underline
 SASS
@@ -117,6 +120,7 @@ span.turkey
 
 #overhere
   bored: sorta
+
   /*                  it's for a good
    * cause
   better_than: thread_pools
@@ -168,12 +172,16 @@ CSS
     assert_equal(<<SASS, css2sass(<<CSS))
 hello
   parent: true
+
   there
     parent: false
+
   who
     hoo: false
+
   why
     y: true
+
   when
     wen: nao
 
@@ -229,6 +237,7 @@ CSS
     assert_equal(<<SASS, css2sass(<<CSS))
 \\:focus
   a: b
+
   \\:foo
     bar: baz
 SASS
@@ -243,14 +252,17 @@ CSS
   .bar!
     .baz
       a: b
+
     .bip
       c: d
+
   .bar .bonk
     e: f
 
 .flip!
   &.bar
     a: b
+
   &.baz
     c: d
 SASS
@@ -263,17 +275,51 @@ SASS
 CSS
   end
 
+  def test_keyframes
+    assert_equal(<<SASS, css2sass(<<CSS))
+@keyframes dash
+  from
+    stroke-dasharray: 1,200
+    stroke-dashoffset: 0
+
+  50%
+    stroke-dasharray: 89,200
+    stroke-dashoffset: -35
+
+  to
+    stroke-dasharray: 89,200
+    stroke-dashoffset: -124
+SASS
+@keyframes dash {
+  from {
+    stroke-dasharray: 1,200;
+    stroke-dashoffset: 0;
+  }
+  50% {
+    stroke-dasharray: 89,200;
+    stroke-dashoffset: -35;
+  }
+  to {
+    stroke-dasharray: 89,200;
+    stroke-dashoffset: -124;
+  }
+}
+CSS
+  end
+
   # Regressions
 
   def test_nesting_with_matching_property
     assert_equal(<<SASS, css2sass(<<CSS))
 ul
   width: 10px
+
   div
     width: 20px
 
 article
   width: 10px
+
   p
     width: 20px
 SASS
@@ -296,6 +342,7 @@ CSS
     assert_equal(<<SASS, css2sass(<<CSS))
 a
   color: red
+
   > b
 SASS
 a {color: red}
@@ -346,6 +393,7 @@ CSS
 .foo >
   .bar
     a: b
+
   .baz
     c: d
 SASS
@@ -357,6 +405,7 @@ CSS
 .foo
   &::bar
     a: b
+
   &::baz
     c: d
 SASS

data/test/sass/css_variable_test.rb

@@ -0,0 +1,132 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/../test_helper'
+require 'sass/engine'
+
+class CssVariableTest < MiniTest::Test
+  def test_variable_warning_for_operators
+    resolve_with_variable_warning("1 == 2")
+    resolve_with_variable_warning("1 != 2")
+    resolve_with_variable_warning("1 < 2")
+    resolve_with_variable_warning("1 <= 2")
+    resolve_with_variable_warning("1 > 2")
+    resolve_with_variable_warning("1 >= 2")
+    resolve_with_variable_warning("1 + 1")
+    resolve_with_variable_warning("1 - 1")
+    resolve_with_variable_warning("1 * 1")
+    resolve_with_variable_warning("1 % 1")
+  end
+
+  def test_variable_warning_for_variable
+    render_with_variable_warning(<<SCSS, "$var", 3)
+.foo {
+  $var: value;
+  --var: $var;
+}
+SCSS
+  end
+
+  def test_variable_warning_for_core_function
+    resolve_with_variable_warning("alpha(#abc)")
+  end
+
+  def test_variable_warning_for_sass_function
+    render_with_variable_warning(<<SCSS, "my-fn()", 2)
+@function my-fn() {@return null}
+.foo {--var: my-fn()}
+SCSS
+  end
+
+  def test_variable_warning_for_parens
+    resolve_with_variable_warning("(foo)", "foo")
+    resolve_with_variable_warning("(foo,)")
+  end
+
+  def test_variable_warning_for_selector
+    resolve_with_variable_warning("&")
+  end
+
+  def test_variable_warning_for_nested_properties
+    assert_warning(<<WARNING) {render(<<SCSS)}
+DEPRECATION WARNING on line 2 of #{filename_for_test :scss}:
+Sass 3.6 will change the way CSS variables are parsed. Instead of being parsed as
+normal properties, they will not allow any Sass-specific behavior other than \#{}.
+WARNING
+.foo {
+  --var: {
+    a: b;
+  }
+}
+SCSS
+  end
+
+  def test_no_warning
+    assert_no_variable_warning("foo")
+    assert_no_variable_warning("true")
+    assert_no_variable_warning("1, 2")
+    assert_no_variable_warning("1 2")
+    assert_no_variable_warning("1 / 2")
+    assert_no_variable_warning("foo / bar")
+    assert_no_variable_warning("asdf(foo)")
+    assert_no_variable_warning("calc(1 + 1)")
+    assert_no_variable_warning("asdf(foo=2)")
+  end
+
+  def test_no_warning_within_interpolation
+    assert_no_variable_warning('#{1 + 1}')
+    assert_no_variable_warning('#{alpha(#abc)}')
+  end
+
+  private
+
+  def assert_no_variable_warning(str)
+    assert_no_warning {render("a {--var: #{str}}")}
+    assert_no_warning {render("a\n  --var: #{str}", :syntax => :sass)}
+  end
+
+  def resolve_with_variable_warning(str, expression = nil)
+    render_with_variable_warning("a {--var: #{str}}", expression || str, 1)
+    render_with_variable_warning(
+      "a\n  --var: #{str}", expression || str, 2, :syntax => :sass)
+  end
+
+  def render_with_variable_warning(sass, expression, line, opts = {})
+    opts[:syntax] ||= :scss
+    assert_warning(<<WARNING) {render(sass, opts)}
+DEPRECATION WARNING on line #{line} of #{filename_for_test(opts[:syntax])}:
+Sass 3.6 will change the way CSS variables are parsed. Instead of being parsed as
+normal properties, they will not allow any Sass-specific behavior other than \#{}.
+For forwards-compatibility, use \#{}:
+
+  --variable: \#{#{expression}};
+WARNING
+  end
+
+  def render(sass, options = {})
+    options[:syntax] ||= :scss
+    options[:cache] = false
+    munge_filename options
+    Sass::Engine.new(sass, options).render
+  end
+
+  def resolve(str, opts = {}, environment = env)
+    munge_filename opts
+    val = eval(str, opts, environment)
+    assert_kind_of Sass::Script::Value::Base, val
+    val.options = opts
+    val.is_a?(Sass::Script::Value::String) ? val.value : val.to_s
+  end
+
+  def eval(str, opts = {}, environment = env)
+    munge_filename opts
+    Sass::Script.parse(str, opts.delete(:line) || 1,
+      opts.delete(:offset) || 0, opts).
+      perform(Sass::Environment.new(environment, opts))
+  end
+
+  def env(hash = {})
+    env = Sass::Environment.new
+    hash.each {|k, v| env.set_var(k, v)}
+    env
+  end
+end