sass 3.4.25 → 3.5.0

data/test/sass/scss/rx_test.rb

@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
 require File.dirname(__FILE__) + '/../../test_helper'
 require 'sass/engine'

data/test/sass/scss/scss_test.rb

@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
 require File.dirname(__FILE__) + '/test_helper'
 
@@ -3389,22 +3388,22 @@ SCSS
   def test_uses_property_exception_with_star_hack
     render <<SCSS
 foo {
-  *bar:baz [fail]; }
+  *bar:baz <fail>; }
 SCSS
     assert(false, "Expected syntax error")
   rescue Sass::SyntaxError => e
-    assert_equal 'Invalid CSS after "  *bar:baz ": expected ";", was "[fail]; }"', e.message
+    assert_equal 'Invalid CSS after "  *bar:baz <fail>": expected expression (e.g. 1px, bold), was "; }"', e.message
     assert_equal 2, e.sass_line
   end
 
   def test_uses_property_exception_with_colon_hack
     render <<SCSS
 foo {
-  :bar:baz [fail]; }
+  :bar:baz <fail>; }
 SCSS
     assert(false, "Expected syntax error")
   rescue Sass::SyntaxError => e
-    assert_equal 'Invalid CSS after "  :bar:baz ": expected ";", was "[fail]; }"', e.message
+    assert_equal 'Invalid CSS after "  :bar:baz <fail>": expected expression (e.g. 1px, bold), was "; }"', e.message
     assert_equal 2, e.sass_line
   end
 
@@ -3422,22 +3421,22 @@ SCSS
   def test_uses_property_exception_with_space_after_name
     render <<SCSS
 foo {
-  bar: baz [fail]; }
+  bar: baz <fail>; }
 SCSS
     assert(false, "Expected syntax error")
   rescue Sass::SyntaxError => e
-    assert_equal 'Invalid CSS after "  bar: baz ": expected ";", was "[fail]; }"', e.message
+    assert_equal 'Invalid CSS after "  bar: baz <fail>": expected expression (e.g. 1px, bold), was "; }"', e.message
     assert_equal 2, e.sass_line
   end
 
   def test_uses_property_exception_with_non_identifier_after_name
     render <<SCSS
 foo {
-  bar:1px [fail]; }
+  bar:1px <fail>; }
 SCSS
     assert(false, "Expected syntax error")
   rescue Sass::SyntaxError => e
-    assert_equal 'Invalid CSS after "  bar:1px ": expected ";", was "[fail]; }"', e.message
+    assert_equal 'Invalid CSS after "  bar:1px <fail>": expected expression (e.g. 1px, bold), was "; }"', e.message
     assert_equal 2, e.sass_line
   end
 
@@ -3827,7 +3826,7 @@ SCSS
   def test_parsing_decimals_followed_by_comments_doesnt_take_forever
     assert_equal(<<CSS, render(<<SCSS))
 .foo {
-  padding: 4.21053% 4.21053% 5.63158%; }
+  padding: 4.2105263158% 4.2105263158% 5.6315789474%; }
 CSS
 .foo {
   padding: 4.21052631578947% 4.21052631578947% 5.631578947368421% /**/
@@ -3942,12 +3941,13 @@ a.\#{"foo"} b
 SCSS
   end
 
-  def test_extra_comma_in_mixin_arglist_error
-    assert_raise_message(Sass::SyntaxError, <<MESSAGE.rstrip) {render <<SCSS}
-Invalid CSS after "...clude foo(bar, ": expected mixin argument, was ");"
-MESSAGE
-@mixin foo($a1, $a2) {
-  baz: $a1 $a2;
+  def test_extra_comma_in_mixin_arglist
+    assert_equal <<CSS, render(<<SCSS)
+.bar {
+  baz: bar; }
+CSS
+@mixin foo($a1,) {
+  baz: $a1;
 }
 
 .bar {
@@ -3956,6 +3956,39 @@ MESSAGE
 SCSS
   end
 
+
+  def test_extra_comma_between_parameters_in_mixin_arglist
+    assert_raise_message(Sass::SyntaxError, "Invalid CSS after \"...nclude foo(bar,\": expected \")\", was \", baz );\"") {render <<SCSS}
+@mixin foo($a1, $a2) {
+  baz: $a1;
+  bef: $a2;
+}
+
+.bar {
+  @include foo(bar,, baz );
+}
+SCSS
+  end
+
+
+  def test_extra_comma_in_mixin_arglist_ending_needs_have_parentheses_after
+    assert_raise_message(Sass::SyntaxError, "Invalid CSS after \"    bri,\": expected \")\", was \"};\"") {render <<SCSS}
+@mixin foo($a1, $a2) {
+  baz: $a1;
+  bal: $a2;
+}
+
+.bar {
+  @include foo(
+    bar,
+    bri,
+  };
+}
+SCSS
+  end
+
+
+
   def test_interpolation
     assert_equal <<CSS, render(<<SCSS)
 ul li#foo a span.label {

data/test/sass/source_map_test.rb

@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
 require File.dirname(__FILE__) + '/../test_helper'
 require File.dirname(__FILE__) + '/test_helper'
@@ -61,7 +60,7 @@ JSON
   end
 
   def test_simple_mapping_with_file_uris
-    uri = Sass::Util.file_uri_from_path(Sass::Util.absolute_path(filename_for_test(:scss)))
+    uri = Sass::Util.file_uri_from_path(File.absolute_path(filename_for_test(:scss)))
     assert_parses_with_sourcemap <<SCSS, <<CSS, <<JSON, :sourcemap => :file
 a {
   foo: bar;
@@ -137,9 +136,8 @@ CSS
 JSON
   end
 
-  unless Sass::Util.ruby1_8?
-    def test_simple_charset_mapping_scss
-      assert_parses_with_sourcemap <<SCSS, <<CSS, <<JSON
+  def test_simple_charset_mapping_scss
+    assert_parses_with_sourcemap <<SCSS, <<CSS, <<JSON
 a {
   fóó: bár;
 }
@@ -158,10 +156,10 @@ CSS
 "file": "test.css"
 }
 JSON
-    end
+  end
 
-    def test_simple_charset_mapping_sass
-      assert_parses_with_sourcemap <<SASS, <<CSS, <<JSON, :syntax => :sass
+  def test_simple_charset_mapping_sass
+    assert_parses_with_sourcemap <<SASS, <<CSS, <<JSON, :syntax => :sass
 a
   fóó: bár
 SASS
@@ -179,10 +177,10 @@ CSS
 "file": "test.css"
 }
 JSON
-    end
+  end
 
-    def test_different_charset_than_encoding_scss
-      assert_parses_with_sourcemap(<<SCSS.force_encoding("IBM866"), <<CSS, <<JSON)
+  def test_different_charset_than_encoding_scss
+    assert_parses_with_sourcemap(<<SCSS.force_encoding("IBM866"), <<CSS, <<JSON)
 @charset "IBM866";
 f\x86\x86 {
   \x86: b;
@@ -202,10 +200,10 @@ CSS
 "file": "test.css"
 }
 JSON
-    end
+  end
 
-    def test_different_charset_than_encoding_sass
-      assert_parses_with_sourcemap(<<SASS.force_encoding("IBM866"), <<CSS, <<JSON, :syntax => :sass)
+  def test_different_charset_than_encoding_sass
+    assert_parses_with_sourcemap(<<SASS.force_encoding("IBM866"), <<CSS, <<JSON, :syntax => :sass)
 @charset "IBM866"
 f\x86\x86
   \x86: b
@@ -224,7 +222,6 @@ CSS
 "file": "test.css"
 }
 JSON
-    end
   end
 
   def test_import_sourcemap_scss
@@ -796,7 +793,7 @@ SCSS
 
     interpolated = engine.to_tree.children.
       first.children.
-      first.value.children[1]
+      first.value.first.children[1]
     assert_equal "123", interpolated.to_sass
     range = interpolated.source_range
     assert_equal 3, range.start_pos.line

data/test/sass/superselector_test.rb

@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../test_helper'
 
 class SuperselectorTest < MiniTest::Test

data/test/sass/util/multibyte_string_scanner_test.rb

@@ -1,155 +1,152 @@
-#!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
 require File.dirname(__FILE__) + '/../../test_helper'
 
-unless Sass::Util.ruby1_8?
-  class MultibyteStringScannerTest < MiniTest::Test
-    def setup
-      @scanner = Sass::Util::MultibyteStringScanner.new("cölorfül")
-    end
+class MultibyteStringScannerTest < MiniTest::Test
+  def setup
+    @scanner = Sass::Util::MultibyteStringScanner.new("cölorfül")
+  end
 
-    def test_initial
-      assert_scanner_state 0, 0, nil, nil
-    end
+  def test_initial
+    assert_scanner_state 0, 0, nil, nil
+  end
 
-    def test_check
-      assert_equal 'cö', @scanner.check(/../)
-      assert_scanner_state 0, 0, 2, 3
-      assert_equal 0, @scanner.pos
-      assert_equal 0, @scanner.pos
-      assert_equal 2, @scanner.matched_size
-      assert_equal 3, @scanner.byte_matched_size
-    end
+  def test_check
+    assert_equal 'cö', @scanner.check(/../)
+    assert_scanner_state 0, 0, 2, 3
+    assert_equal 0, @scanner.pos
+    assert_equal 0, @scanner.pos
+    assert_equal 2, @scanner.matched_size
+    assert_equal 3, @scanner.byte_matched_size
+  end
 
-    def test_check_until
-      assert_equal 'cölorfü', @scanner.check_until(/f./)
-      assert_scanner_state 0, 0, 2, 3
-    end
+  def test_check_until
+    assert_equal 'cölorfü', @scanner.check_until(/f./)
+    assert_scanner_state 0, 0, 2, 3
+  end
 
-    def test_getch
-      assert_equal 'c', @scanner.getch
-      assert_equal 'ö', @scanner.getch
-      assert_scanner_state 2, 3, 1, 2
-    end
+  def test_getch
+    assert_equal 'c', @scanner.getch
+    assert_equal 'ö', @scanner.getch
+    assert_scanner_state 2, 3, 1, 2
+  end
 
-    def test_match?
-      assert_equal 2, @scanner.match?(/../)
-      assert_scanner_state 0, 0, 2, 3
-    end
+  def test_match?
+    assert_equal 2, @scanner.match?(/../)
+    assert_scanner_state 0, 0, 2, 3
+  end
 
-    def test_peek
-      assert_equal 'cö', @scanner.peek(2)
-      assert_scanner_state 0, 0, nil, nil
-    end
+  def test_peek
+    assert_equal 'cö', @scanner.peek(2)
+    assert_scanner_state 0, 0, nil, nil
+  end
 
-    def test_rest_size
-      assert_equal 'cö', @scanner.scan(/../)
-      assert_equal 6, @scanner.rest_size
-    end
+  def test_rest_size
+    assert_equal 'cö', @scanner.scan(/../)
+    assert_equal 6, @scanner.rest_size
+  end
 
-    def test_scan
-      assert_equal 'cö', @scanner.scan(/../)
-      assert_scanner_state 2, 3, 2, 3
-    end
+  def test_scan
+    assert_equal 'cö', @scanner.scan(/../)
+    assert_scanner_state 2, 3, 2, 3
+  end
 
-    def test_scan_until
-      assert_equal 'cölorfü', @scanner.scan_until(/f./)
-      assert_scanner_state 7, 9, 2, 3
-    end
+  def test_scan_until
+    assert_equal 'cölorfü', @scanner.scan_until(/f./)
+    assert_scanner_state 7, 9, 2, 3
+  end
 
-    def test_skip
-      assert_equal 2, @scanner.skip(/../)
-      assert_scanner_state 2, 3, 2, 3
-    end
+  def test_skip
+    assert_equal 2, @scanner.skip(/../)
+    assert_scanner_state 2, 3, 2, 3
+  end
 
-    def test_skip_until
-      assert_equal 7, @scanner.skip_until(/f./)
-      assert_scanner_state 7, 9, 2, 3
-    end
+  def test_skip_until
+    assert_equal 7, @scanner.skip_until(/f./)
+    assert_scanner_state 7, 9, 2, 3
+  end
 
-    def test_set_pos
-      @scanner.pos = 7
-      assert_scanner_state 7, 9, nil, nil
-      @scanner.pos = 6
-      assert_scanner_state 6, 7, nil, nil
-      @scanner.pos = 1
-      assert_scanner_state 1, 1, nil, nil
-    end
+  def test_set_pos
+    @scanner.pos = 7
+    assert_scanner_state 7, 9, nil, nil
+    @scanner.pos = 6
+    assert_scanner_state 6, 7, nil, nil
+    @scanner.pos = 1
+    assert_scanner_state 1, 1, nil, nil
+  end
 
-    def test_reset
-      @scanner.scan(/../)
-      @scanner.reset
-      assert_scanner_state 0, 0, nil, nil
-    end
+  def test_reset
+    @scanner.scan(/../)
+    @scanner.reset
+    assert_scanner_state 0, 0, nil, nil
+  end
 
-    def test_scan_full
-      assert_equal 'cö', @scanner.scan_full(/../, true, true)
-      assert_scanner_state 2, 3, 2, 3
+  def test_scan_full
+    assert_equal 'cö', @scanner.scan_full(/../, true, true)
+    assert_scanner_state 2, 3, 2, 3
 
-      @scanner.reset
-      assert_equal 'cö', @scanner.scan_full(/../, false, true)
-      assert_scanner_state 0, 0, 2, 3
+    @scanner.reset
+    assert_equal 'cö', @scanner.scan_full(/../, false, true)
+    assert_scanner_state 0, 0, 2, 3
 
-      @scanner.reset
-      assert_nil @scanner.scan_full(/../, true, false)
-      assert_scanner_state 2, 3, 2, 3
+    @scanner.reset
+    assert_nil @scanner.scan_full(/../, true, false)
+    assert_scanner_state 2, 3, 2, 3
 
-      @scanner.reset
-      assert_nil @scanner.scan_full(/../, false, false)
-      assert_scanner_state 0, 0, 2, 3
-    end
+    @scanner.reset
+    assert_nil @scanner.scan_full(/../, false, false)
+    assert_scanner_state 0, 0, 2, 3
+  end
 
-    def test_search_full
-      assert_equal 'cölorfü', @scanner.search_full(/f./, true, true)
-      assert_scanner_state 7, 9, 2, 3
+  def test_search_full
+    assert_equal 'cölorfü', @scanner.search_full(/f./, true, true)
+    assert_scanner_state 7, 9, 2, 3
 
-      @scanner.reset
-      assert_equal 'cölorfü', @scanner.search_full(/f./, false, true)
-      assert_scanner_state 0, 0, 2, 3
+    @scanner.reset
+    assert_equal 'cölorfü', @scanner.search_full(/f./, false, true)
+    assert_scanner_state 0, 0, 2, 3
 
-      @scanner.reset
-      assert_nil @scanner.search_full(/f./, true, false)
-      assert_scanner_state 7, 9, 2, 3
+    @scanner.reset
+    assert_nil @scanner.search_full(/f./, true, false)
+    assert_scanner_state 7, 9, 2, 3
 
-      @scanner.reset
-      assert_nil @scanner.search_full(/f./, false, false)
-      assert_scanner_state 0, 0, 2, 3
-    end
+    @scanner.reset
+    assert_nil @scanner.search_full(/f./, false, false)
+    assert_scanner_state 0, 0, 2, 3
+  end
 
-    def test_set_string
-      @scanner.scan(/../)
-      @scanner.string = 'föóbâr'
-      assert_scanner_state 0, 0, nil, nil
-    end
+  def test_set_string
+    @scanner.scan(/../)
+    @scanner.string = 'föóbâr'
+    assert_scanner_state 0, 0, nil, nil
+  end
 
-    def test_terminate
-      @scanner.scan(/../)
-      @scanner.terminate
-      assert_scanner_state 8, 10, nil, nil
-    end
+  def test_terminate
+    @scanner.scan(/../)
+    @scanner.terminate
+    assert_scanner_state 8, 10, nil, nil
+  end
 
-    def test_unscan
-      @scanner.scan(/../)
-      @scanner.scan_until(/f./)
-      @scanner.unscan
-      assert_scanner_state 2, 3, nil, nil
-    end
+  def test_unscan
+    @scanner.scan(/../)
+    @scanner.scan_until(/f./)
+    @scanner.unscan
+    assert_scanner_state 2, 3, nil, nil
+  end
 
-    private
-
-    def assert_scanner_state(pos, byte_pos, matched_size, byte_matched_size)
-      assert_equal pos, @scanner.pos, 'pos'
-      assert_equal byte_pos, @scanner.byte_pos, 'byte_pos'
-      if matched_size.nil?
-        assert_nil @scanner.matched_size, 'matched_size'
-      else
-        assert_equal matched_size, @scanner.matched_size, 'matched_size'
-      end
-      if byte_matched_size.nil?
-        assert_nil @scanner.byte_matched_size, 'byte_matched_size'
-      else
-        assert_equal byte_matched_size, @scanner.byte_matched_size, 'byte_matched_size'
-      end
+  private
+
+  def assert_scanner_state(pos, byte_pos, matched_size, byte_matched_size)
+    assert_equal pos, @scanner.pos, 'pos'
+    assert_equal byte_pos, @scanner.byte_pos, 'byte_pos'
+    if matched_size.nil?
+      assert_nil @scanner.matched_size, 'matched_size'
+    else
+      assert_equal matched_size, @scanner.matched_size, 'matched_size'
+    end
+    if byte_matched_size.nil?
+      assert_nil @scanner.byte_matched_size, 'byte_matched_size'
+    else
+      assert_equal byte_matched_size, @scanner.byte_matched_size, 'byte_matched_size'
     end
   end
 end

data/test/sass/util/normalized_map_test.rb

@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../../test_helper'
 require 'sass/util/normalized_map'
 

data/test/sass/util/subset_map_test.rb

@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../../test_helper'
 
 class SubsetMapTest < MiniTest::Test

data/test/sass/util_test.rb

@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../test_helper'
 require 'pathname'
 require 'tmpdir'
@@ -10,14 +9,6 @@ class UtilTest < MiniTest::Test
     assert(File.exist?(scope("Rakefile")))
   end
 
-  def test_to_hash
-    assert_equal({
-        :foo => 1,
-        :bar => 2,
-        :baz => 3
-      }, to_hash([[:foo, 1], [:bar, 2], [:baz, 3]]))
-  end
-
   def test_map_keys
     assert_equal({
         "foo" => 1,
@@ -52,7 +43,6 @@ class UtilTest < MiniTest::Test
   end
 
   def test_powerset
-    return unless Set[Set[]] == Set[Set[]] # There's a bug in Ruby 1.8.6 that breaks nested set equality
     assert_equal([[].to_set].to_set,
       powerset([]))
     assert_equal([[].to_set, [1].to_set].to_set,
@@ -139,13 +129,6 @@ class UtilTest < MiniTest::Test
       lcs([-5, 3, 2, 8], [-4, 1, 8]) {|a, b| (a - b).abs <= 1 && [a, b].max})
   end
 
-  def test_group_by_to_a
-    assert_equal([[1, [1, 3, 5, 7]], [0, [2, 4, 6, 8]]],
-      group_by_to_a(1..8) {|i| i % 2})
-    assert_equal([[1, [1, 4, 7, 10]], [2, [2, 5, 8, 11]], [0, [3, 6, 9, 12]]],
-      group_by_to_a(1..12) {|i| i % 3})
-  end
-
   def test_subsequence
     assert(subsequence?([1, 2, 3], [1, 2, 3]))
     assert(subsequence?([1, 2, 3], [1, :a, 2, :b, 3]))
@@ -180,32 +163,12 @@ class UtilTest < MiniTest::Test
     $stderr = old_stderr
   end
 
-  def test_has
-    assert(has?(:instance_method, String, :chomp!))
-    assert(has?(:private_instance_method, Sass::Engine, :parse_interp))
-  end
-
-  def test_enum_with_index
-    assert_equal(%w[foo0 bar1 baz2],
-      enum_with_index(%w[foo bar baz]).map {|s, i| "#{s}#{i}"})
-  end
-
-  def test_enum_cons
-    assert_equal(%w[foobar barbaz],
-      enum_cons(%w[foo bar baz], 2).map {|s1, s2| "#{s1}#{s2}"})
-  end
-
   def test_extract
     arr = [1, 2, 3, 4, 5]
     assert_equal([1, 3, 5], extract!(arr) {|e| e % 2 == 1})
     assert_equal([2, 4], arr)
   end
 
-  def test_ord
-    assert_equal(102, ord("f"))
-    assert_equal(98, ord("bar"))
-  end
-
   def test_flatten_vertically
     assert_equal([1, 2, 3], flatten_vertically([1, 2, 3]))
     assert_equal([1, 3, 5, 2, 4, 6], flatten_vertically([[1, 2], [3, 4], [5, 6]]))
@@ -356,8 +319,10 @@ WARNING
 
   def test_round_respects_precision
     original_precision = Sass::Script::Value::Number.precision
-    assert_equal 0, Sass::Util.round(0.49999)
-    assert_equal 1, Sass::Util.round(0.499999)
+    assert_equal 0, Sass::Util.round(0.4999999999)
+    # 10 9s doesn't work because 0.49999999999 - 0.5 is very slightly greater
+    # than -0.1e11 due to float nonsense.
+    assert_equal 1, Sass::Util.round(0.499999999999)
     Sass::Script::Value::Number.precision = 6
     assert_equal 0, Sass::Util.round(0.499999)
     assert_equal 1, Sass::Util.round(0.49999999)

data/test/sass/value_helpers_test.rb

@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../test_helper'
 
 class ValueHelpersTest < MiniTest::Test

data/test/sass-spec.yml

@@ -1,3 +1,3 @@
 ---
 :enabled: true
-:language_version: '3.4'
+:language_version: '3.5'

data/test/test_helper.rb

@@ -93,6 +93,45 @@ class MiniTest::Test
   else
     flunk "Expected exception on line #{line}, none raised"
   end
+
+  def assert_sass_to_sass(sass, options: {})
+    assert_equal(sass.rstrip, to_sass(sass, options).rstrip,
+      "Expected Sass to transform to itself")
+  end
+
+  def assert_scss_to_sass(sass, scss, options: {})
+    assert_equal(sass.rstrip, to_sass(scss, options.merge(:syntax => :scss)).rstrip,
+      "Expected SCSS to transform to Sass")
+  end
+
+  def assert_scss_to_scss(scss, source: scss, options: {})
+    assert_equal(scss.rstrip, to_scss(source, options.merge(:syntax => :scss)).rstrip,
+      "Expected SCSS to transform to #{scss == source ? 'itself' : 'SCSS'}")
+  end
+
+  def assert_sass_to_scss(scss, sass, options: {})
+    assert_equal(scss.rstrip, to_scss(sass, options).rstrip,
+      "Expected Sass to transform to SCSS")
+  end
+
+  def assert_converts(sass, scss, options: {})
+    assert_sass_to_sass(sass, options: options)
+    assert_scss_to_sass(sass, scss, options: options)
+    assert_scss_to_scss(scss, options: options)
+    assert_sass_to_scss(scss, sass, options: options)
+  end
+
+  def to_sass(scss, options = {})
+    Sass::Util.silence_sass_warnings do
+      Sass::Engine.new(scss, options).to_tree.to_sass(options)
+    end
+  end
+
+  def to_scss(sass, options = {})
+    Sass::Util.silence_sass_warnings do
+      Sass::Engine.new(sass, options).to_tree.to_scss(options)
+    end
+  end
 end
 
 module PublicApiLinter