sass 3.4.25 → 3.5.0.pre.rc.1

data/lib/sass/util/multibyte_string_scanner.rb

@@ -1,155 +1,151 @@
 require 'strscan'
 
-if Sass::Util.ruby1_8?
-  Sass::Util::MultibyteStringScanner = StringScanner
-else
-  if Sass::Util.rbx?
-    # Rubinius's StringScanner class implements some of its methods in terms of
-    # others, which causes us to double-count bytes in some cases if we do
-    # straightforward inheritance. To work around this, we use a delegate class.
-    require 'delegate'
-    class Sass::Util::MultibyteStringScanner < DelegateClass(StringScanner)
-      def initialize(str)
-        super(StringScanner.new(str))
-        @mb_pos = 0
-        @mb_matched_size = nil
-        @mb_last_pos = nil
-      end
-
-      def is_a?(klass)
-        __getobj__.is_a?(klass) || super
-      end
+if Sass::Util.rbx?
+  # Rubinius's StringScanner class implements some of its methods in terms of
+  # others, which causes us to double-count bytes in some cases if we do
+  # straightforward inheritance. To work around this, we use a delegate class.
+  require 'delegate'
+  class Sass::Util::MultibyteStringScanner < DelegateClass(StringScanner)
+    def initialize(str)
+      super(StringScanner.new(str))
+      @mb_pos = 0
+      @mb_matched_size = nil
+      @mb_last_pos = nil
     end
-  else
-    class Sass::Util::MultibyteStringScanner < StringScanner
-      def initialize(str)
-        super
-        @mb_pos = 0
-        @mb_matched_size = nil
-        @mb_last_pos = nil
-      end
+
+    def is_a?(klass)
+      __getobj__.is_a?(klass) || super
     end
   end
-
-  # A wrapper of the native StringScanner class that works correctly with
-  # multibyte character encodings. The native class deals only in bytes, not
-  # characters, for methods like [#pos] and [#matched_size]. This class deals
-  # only in characters, instead.
-  class Sass::Util::MultibyteStringScanner
-    def self.new(str)
-      return StringScanner.new(str) if str.ascii_only?
+else
+  class Sass::Util::MultibyteStringScanner < StringScanner
+    def initialize(str)
       super
+      @mb_pos = 0
+      @mb_matched_size = nil
+      @mb_last_pos = nil
     end
+  end
+end
 
-    alias_method :byte_pos, :pos
-    alias_method :byte_matched_size, :matched_size
-
-    def check(pattern); _match super; end
-    def check_until(pattern); _matched super; end
-    def getch; _forward _match super; end
-    def match?(pattern); _size check(pattern); end
-    def matched_size; @mb_matched_size; end
-    def peek(len); string[@mb_pos, len]; end
-    alias_method :peep, :peek
-    def pos; @mb_pos; end
-    alias_method :pointer, :pos
-    def rest_size; rest.size; end
-    def scan(pattern); _forward _match super; end
-    def scan_until(pattern); _forward _matched super; end
-    def skip(pattern); _size scan(pattern); end
-    def skip_until(pattern); _matched _size scan_until(pattern); end
-
-    def get_byte
-      raise "MultibyteStringScanner doesn't support #get_byte."
-    end
+# A wrapper of the native StringScanner class that works correctly with
+# multibyte character encodings. The native class deals only in bytes, not
+# characters, for methods like [#pos] and [#matched_size]. This class deals
+# only in characters, instead.
+class Sass::Util::MultibyteStringScanner
+  def self.new(str)
+    return StringScanner.new(str) if str.ascii_only?
+    super
+  end
 
-    def getbyte
-      raise "MultibyteStringScanner doesn't support #getbyte."
-    end
+  alias_method :byte_pos, :pos
+  alias_method :byte_matched_size, :matched_size
+
+  def check(pattern); _match super; end
+  def check_until(pattern); _matched super; end
+  def getch; _forward _match super; end
+  def match?(pattern); _size check(pattern); end
+  def matched_size; @mb_matched_size; end
+  def peek(len); string[@mb_pos, len]; end
+  alias_method :peep, :peek
+  def pos; @mb_pos; end
+  alias_method :pointer, :pos
+  def rest_size; rest.size; end
+  def scan(pattern); _forward _match super; end
+  def scan_until(pattern); _forward _matched super; end
+  def skip(pattern); _size scan(pattern); end
+  def skip_until(pattern); _matched _size scan_until(pattern); end
+
+  def get_byte
+    raise "MultibyteStringScanner doesn't support #get_byte."
+  end
 
-    def pos=(n)
-      @mb_last_pos = nil
+  def getbyte
+    raise "MultibyteStringScanner doesn't support #getbyte."
+  end
 
-      # We set position kind of a lot during parsing, so we want it to be as
-      # efficient as possible. This is complicated by the fact that UTF-8 is a
-      # variable-length encoding, so it's difficult to find the byte length that
-      # corresponds to a given character length.
-      #
-      # Our heuristic here is to try to count the fewest possible characters. So
-      # if the new position is close to the current one, just count the
-      # characters between the two; if the new position is closer to the
-      # beginning of the string, just count the characters from there.
-      if @mb_pos - n < @mb_pos / 2
-        # New position is close to old position
-        byte_delta = @mb_pos > n ? -string[n...@mb_pos].bytesize : string[@mb_pos...n].bytesize
-        super(byte_pos + byte_delta)
-      else
-        # New position is close to BOS
-        super(string[0...n].bytesize)
-      end
-      @mb_pos = n
-    end
+  def pos=(n)
+    @mb_last_pos = nil
+
+    # We set position kind of a lot during parsing, so we want it to be as
+    # efficient as possible. This is complicated by the fact that UTF-8 is a
+    # variable-length encoding, so it's difficult to find the byte length that
+    # corresponds to a given character length.
+    #
+    # Our heuristic here is to try to count the fewest possible characters. So
+    # if the new position is close to the current one, just count the
+    # characters between the two; if the new position is closer to the
+    # beginning of the string, just count the characters from there.
+    if @mb_pos - n < @mb_pos / 2
+      # New position is close to old position
+      byte_delta = @mb_pos > n ? -string[n...@mb_pos].bytesize : string[@mb_pos...n].bytesize
+      super(byte_pos + byte_delta)
+    else
+      # New position is close to BOS
+      super(string[0...n].bytesize)
+    end
+    @mb_pos = n
+  end
 
-    def reset
-      @mb_pos = 0
-      @mb_matched_size = nil
-      @mb_last_pos = nil
-      super
-    end
+  def reset
+    @mb_pos = 0
+    @mb_matched_size = nil
+    @mb_last_pos = nil
+    super
+  end
 
-    def scan_full(pattern, advance_pointer_p, return_string_p)
-      res = _match super(pattern, advance_pointer_p, true)
-      _forward res if advance_pointer_p
-      return res if return_string_p
-    end
+  def scan_full(pattern, advance_pointer_p, return_string_p)
+    res = _match super(pattern, advance_pointer_p, true)
+    _forward res if advance_pointer_p
+    return res if return_string_p
+  end
 
-    def search_full(pattern, advance_pointer_p, return_string_p)
-      res = super(pattern, advance_pointer_p, true)
-      _forward res if advance_pointer_p
-      _matched((res if return_string_p))
-    end
+  def search_full(pattern, advance_pointer_p, return_string_p)
+    res = super(pattern, advance_pointer_p, true)
+    _forward res if advance_pointer_p
+    _matched((res if return_string_p))
+  end
 
-    def string=(str)
-      @mb_pos = 0
-      @mb_matched_size = nil
-      @mb_last_pos = nil
-      super
-    end
+  def string=(str)
+    @mb_pos = 0
+    @mb_matched_size = nil
+    @mb_last_pos = nil
+    super
+  end
 
-    def terminate
-      @mb_pos = string.size
-      @mb_matched_size = nil
-      @mb_last_pos = nil
-      super
-    end
-    alias_method :clear, :terminate
+  def terminate
+    @mb_pos = string.size
+    @mb_matched_size = nil
+    @mb_last_pos = nil
+    super
+  end
+  alias_method :clear, :terminate
 
-    def unscan
-      super
-      @mb_pos = @mb_last_pos
-      @mb_last_pos = @mb_matched_size = nil
-    end
+  def unscan
+    super
+    @mb_pos = @mb_last_pos
+    @mb_last_pos = @mb_matched_size = nil
+  end
 
-    private
+  private
 
-    def _size(str)
-      str && str.size
-    end
+  def _size(str)
+    str && str.size
+  end
 
-    def _match(str)
-      @mb_matched_size = str && str.size
-      str
-    end
+  def _match(str)
+    @mb_matched_size = str && str.size
+    str
+  end
 
-    def _matched(res)
-      _match matched
-      res
-    end
+  def _matched(res)
+    _match matched
+    res
+  end
 
-    def _forward(str)
-      @mb_last_pos = @mb_pos
-      @mb_pos += str.size if str
-      str
-    end
+  def _forward(str)
+    @mb_last_pos = @mb_pos
+    @mb_pos += str.size if str
+    str
   end
 end

data/lib/sass/util/normalized_map.rb

@@ -5,12 +5,11 @@ module Sass
     # A hash that normalizes its string keys while still allowing you to get back
     # to the original keys that were stored. If several different values normalize
     # to the same value, whichever is stored last wins.
-    require 'sass/util/ordered_hash' if ruby1_8?
     class NormalizedMap
       # Create a normalized map
       def initialize(map = nil)
         @key_strings = {}
-        @map = Util.ruby1_8? ? OrderedHash.new : {}
+        @map = {}
 
         map.each {|key, value| self[key] = value} if map
       end
@@ -115,12 +114,6 @@ module Sass
         @map.send(method, *args, &block)
       end
 
-      if Sass::Util.ruby1_8?
-        def respond_to?(method, include_private = false)
-          super || @map.respond_to?(method, include_private)
-        end
-      end
-
       def respond_to_missing?(method, include_private = false)
         @map.respond_to?(method, include_private)
       end

data/lib/sass/version.rb

@@ -8,7 +8,7 @@ module Sass
   # if it was installed from Git.
   module Version
     # Returns a hash representing the version of Sass.
-    # The `:major`, `:minor`, and `:teeny` keys have their respective numbers as Integers.
+    # The `:major`, `:minor`, and `:teeny` keys have their respective numbers as Fixnums.
     # The `:name` key has the name of the version.
     # The `:string` key contains a human-readable string representation of the version.
     # The `:number` key is the major, minor, and teeny keys separated by periods.
@@ -41,7 +41,7 @@ module Sass
     #       :prerelease_number => 1
     #     }
     #
-    # @return [{Symbol => String/Integer}] The version hash
+    # @return [{Symbol => String/Fixnum}] The version hash
     # @comment
     #   rubocop:disable ClassVars
     def version

data/test/sass-spec.yml

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

data/test/sass/compiler_test.rb

@@ -40,12 +40,10 @@ class CompilerTest < MiniTest::Test
       @run_during_start = run_during_start
     end
 
-    # used for Listen < 2.0
     def start!
       @run_during_start.call(self) if @run_during_start
     end
 
-    # used for Listen >= 2.0
     def start
       parent = Thread.current
       @thread = Thread.new do
@@ -86,18 +84,10 @@ class CompilerTest < MiniTest::Test
 
     private
     def create_listener(*args, &on_filesystem_event)
-      if Sass::Util.listen_geq_2?
-        args.pop if args.last.is_a?(Hash)
-        args.map do |dir|
-          @fake_listener = FakeListener.new(*args, &on_filesystem_event)
-          @fake_listener.on_start!(&run_during_start)
-          @fake_listener
-        end
-      else
-        @fake_listener = FakeListener.new(*args, &on_filesystem_event)
-        @fake_listener.on_start!(&run_during_start)
-        @fake_listener
-      end
+      args.pop if args.last.is_a?(Hash)
+      @fake_listener = FakeListener.new(*args, &on_filesystem_event)
+      @fake_listener.on_start!(&run_during_start)
+      @fake_listener
     end
   end
 

data/test/sass/conversion_test.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../test_helper'
 
 class ConversionTest < MiniTest::Test
   def test_basic
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 foo bar
   baz: bang
   bip: bop
@@ -13,7 +13,7 @@ foo bar {
   bip: bop;
 }
 SCSS
-    silence_warnings {assert_renders <<SASS, <<SCSS, :old => true}
+    assert_converts <<SASS, <<SCSS, options: {old: true}
 foo bar
   :baz bang
   :bip bop
@@ -26,19 +26,19 @@ SCSS
   end
 
   def test_empty_selector
-    assert_renders "foo bar", "foo bar {}"
+    assert_converts "foo bar", "foo bar {}"
   end
 
   def test_empty_directive
-    assert_renders "@media screen", "@media screen {}"
+    assert_converts "@media screen", "@media screen {}"
   end
 
   def test_empty_control_directive
-    assert_renders "@if false", "@if false {}"
+    assert_converts "@if false", "@if false {}"
   end
 
   def test_nesting
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 foo bar
   baz bang
     baz: bang
@@ -58,7 +58,7 @@ SCSS
   end
 
   def test_nesting_with_parent_ref
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 foo bar
   &:hover
     baz: bang
@@ -72,7 +72,7 @@ SCSS
   end
 
   def test_selector_interpolation
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 foo \#{$bar + "baz"}.bip
   baz: bang
 
@@ -90,7 +90,7 @@ SCSS
   end
 
   def test_multiline_selector_with_commas
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 foo bar,
 baz bang
   baz: bang
@@ -101,7 +101,7 @@ baz bang {
 }
 SCSS
 
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 blat
   foo bar,
   baz bang
@@ -136,7 +136,7 @@ SCSS
   end
 
   def test_escaped_selector
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 foo bar
   \\:hover
     baz: bang
@@ -150,7 +150,7 @@ SCSS
   end
 
   def test_property_name_interpolation
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 foo bar
   baz\#{$bang}bip\#{$bop}: 12
 SASS
@@ -161,7 +161,7 @@ SCSS
   end
 
   def test_property_value_interpolation
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 foo bar
   baz: 12 \#{$bang} bip \#{"bop"} blat
 SASS
@@ -172,7 +172,7 @@ SCSS
   end
 
   def test_dynamic_properties
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 foo bar
   baz: 12 $bang "bip"
 SASS
@@ -183,7 +183,7 @@ SCSS
   end
 
   def test_dynamic_properties_with_old
-    silence_warnings {assert_renders <<SASS, <<SCSS, :old => true}
+    assert_converts <<SASS, <<SCSS, options: {old: true}
 foo bar
   :baz 12 $bang "bip"
 SASS
@@ -206,7 +206,7 @@ foo bar {
 }
 SCSS
 
-    assert_scss_to_scss <<OUT, <<IN
+    assert_scss_to_scss <<OUT, source: <<IN
 foo bar {
   baz: bip bam boon;
 }
@@ -233,7 +233,7 @@ foo bar {
 }
 SCSS
 
-    assert_scss_to_scss <<OUT, <<IN
+    assert_scss_to_scss <<OUT, source: <<IN
 foo bar {
   baz: $bip "bam" 12px;
 }
@@ -248,7 +248,7 @@ IN
   end
 
   def test_silent_comments
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 // foo
 
 // bar
@@ -269,7 +269,7 @@ foo bar {
 }
 SCSS
 
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 // foo
 // bar
 //   baz
@@ -288,7 +288,7 @@ foo bar {
 }
 SCSS
 
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 // foo
 // bar
 //   baz
@@ -309,7 +309,7 @@ SCSS
   end
 
   def test_nested_silent_comments
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 foo
   bar: baz
 
@@ -361,7 +361,7 @@ SASS
   end
 
   def test_preserves_triple_slash_comments
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 /// foo
 /// bar
 foo
@@ -378,7 +378,7 @@ SCSS
   end
 
   def test_loud_comments
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 /* foo
 
 /* bar
@@ -429,7 +429,7 @@ foo bar {
 }
 SCSS
 
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 /* foo
  * bar
  *   baz
@@ -450,7 +450,7 @@ SCSS
   end
 
   def test_nested_loud_comments
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 foo
   bar: baz
 
@@ -502,7 +502,7 @@ SASS
   end
 
   def test_preserves_double_star_comments
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 /** foo
  *  bar
 foo
@@ -574,7 +574,7 @@ SCSS
   end
 
   def test_immediately_preceding_comments
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 /* Foo
  * Bar
  * Baz
@@ -589,7 +589,7 @@ SASS
 }
 SCSS
 
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 // Foo
 // Bar
 // Baz
@@ -628,7 +628,7 @@ SASS
   end
 
   def test_debug
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 foo
   @debug 12px
 
@@ -643,7 +643,7 @@ SCSS
   end
 
   def test_error
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 foo
   @error "oh no!"
 
@@ -658,7 +658,7 @@ SCSS
   end
 
   def test_directive_without_children
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 foo
   @foo #bar "baz"
 
@@ -673,7 +673,7 @@ SCSS
   end
 
   def test_directive_with_prop_children
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 foo
   @foo #bar "baz"
     a: b
@@ -693,7 +693,7 @@ SCSS
   end
 
   def test_directive_with_rule_children
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 foo
   @foo #bar "baz"
     #blat
@@ -723,7 +723,7 @@ SCSS
   end
 
   def test_directive_with_rule_and_prop_children
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 foo
   @foo #bar "baz"
     g: h
@@ -761,7 +761,7 @@ SCSS
   end
 
   def test_charset
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 @charset "utf-8"
 SASS
 @charset "utf-8";
@@ -769,7 +769,7 @@ SCSS
   end
 
   def test_for
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 foo
   @for $a from $b to $c
     a: b
@@ -792,7 +792,7 @@ SCSS
   end
 
   def test_while
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 foo
   @while flaz($a + $b)
     a: b
@@ -815,7 +815,7 @@ SCSS
   end
 
   def test_if
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 foo
   @if $foo or $bar
     a: b
@@ -846,7 +846,7 @@ SCSS
   end
 
   def test_each
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 a
   @each $number in 1px 2px 3px 4px
     b: $number
@@ -880,7 +880,7 @@ SCSS
   end
 
   def test_import
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 @import foo
 
 @import url(bar.css)
@@ -897,7 +897,7 @@ foo {
 }
 SCSS
 
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 @import foo.css
 
 @import url(bar.css)
@@ -920,13 +920,13 @@ SCSS
   end
 
   def test_import_as_directive_in_scss
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 @import "foo.css" print
 SASS
 @import "foo.css" print;
 SCSS
 
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 @import url(foo.css) screen, print
 SASS
 @import url(foo.css) screen, print;
@@ -934,7 +934,7 @@ SCSS
   end
 
   def test_adjacent_imports
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 @import foo.sass
 @import bar.scss
 @import baz
@@ -946,7 +946,7 @@ SCSS
   end
 
   def test_non_adjacent_imports
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 @import foo.sass
 
 @import bar.scss
@@ -962,7 +962,7 @@ SCSS
   end
 
   def test_import_with_interpolation
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 $family: unquote("Droid+Sans")
 
 @import url("http://fonts.googleapis.com/css?family=\#{$family}")
@@ -974,7 +974,7 @@ SCSS
   end
 
   def test_extend
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 .foo
   @extend .bar
 
@@ -989,7 +989,7 @@ SCSS
   end
 
   def test_comma_extendee
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 .baz
   @extend .foo, .bar
 SASS
@@ -1000,7 +1000,7 @@ SCSS
   end
 
   def test_argless_mixin_definition
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 =foo-bar
   baz
     a: b
@@ -1038,7 +1038,7 @@ SASS
   end
 
   def test_mixin_definition_without_defaults
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 =foo-bar($baz, $bang)
   baz
     a: $baz $bang
@@ -1052,7 +1052,7 @@ SCSS
   end
 
   def test_mixin_definition_with_defaults
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 =foo-bar($baz, $bang: 12px)
   baz
     a: $baz $bang
@@ -1078,7 +1078,7 @@ SASS
   end
 
   def test_argless_mixin_include
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 foo
   +foo-bar
 
@@ -1093,7 +1093,7 @@ SCSS
   end
 
   def test_mixin_include
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 foo
   +foo-bar(12px, "blaz")
 
@@ -1108,7 +1108,7 @@ SCSS
   end
 
   def test_mixin_include_with_keyword_args
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 foo
   +foo-bar(12px, "blaz", $blip: blap, $bloop: blop)
 
@@ -1127,7 +1127,7 @@ SCSS
   end
 
   def test_consecutive_mixin_includes
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 foo
   +foo-bar
   +foo-bar
@@ -1144,7 +1144,7 @@ SCSS
   end
 
   def test_mixin_include_with_hyphen_conversion_keyword_arg
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 foo
   +foo-bar($a-b_c: val)
 
@@ -1159,7 +1159,7 @@ SCSS
   end
 
   def test_argless_function_definition
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 @function foo()
   $var: 1 + 1
 
@@ -1174,7 +1174,7 @@ SCSS
   end
 
   def test_function_definition_without_defaults
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 @function foo($var1, $var2)
   @if $var1
     @return $var1 + $var2
@@ -1188,7 +1188,7 @@ SCSS
   end
 
   def test_function_definition_with_defaults
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 @function foo($var1, $var2: foo)
   @if $var1
     @return $var1 + $var2
@@ -1202,7 +1202,7 @@ SCSS
   end
 
   def test_variable_definition
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 $var1: 12px + 15px
 
 foo
@@ -1221,7 +1221,7 @@ SCSS
   end
 
   def test_guarded_variable_definition
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 $var1: 12px + 15px !default
 
 foo
@@ -1240,7 +1240,7 @@ SCSS
   end
 
   def test_multiple_variable_definitions
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 $var1: foo
 $var2: bar
 $var3: baz
@@ -1258,7 +1258,7 @@ SCSS
   end
 
   def test_division_asserted_with_parens
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 foo
   a: (1px / 2px)
 SASS
@@ -1269,7 +1269,7 @@ SCSS
   end
 
   def test_division_not_asserted_when_unnecessary
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 $var: 1px / 2px
 
 foo
@@ -1282,7 +1282,7 @@ foo {
 }
 SCSS
 
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 $var: 1px
 
 foo
@@ -1295,7 +1295,7 @@ foo {
 }
 SCSS
 
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 foo
   a: 1 + 1px / 2px
 SASS
@@ -1306,7 +1306,7 @@ SCSS
   end
 
   def test_literal_slash
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 foo
   a: 1px / 2px
 SASS
@@ -1316,7 +1316,7 @@ foo {
 SCSS
 
     # Regression test for issue 1787
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 foo
   a: 1px / 2px 3px
 SASS
@@ -1327,7 +1327,7 @@ SCSS
   end
 
   def test_directive_with_interpolation
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 $baz: 12
 
 @foo bar\#{$baz} qux
@@ -1342,7 +1342,7 @@ SCSS
   end
 
   def test_media_with_interpolation
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 $baz: 12
 
 @media bar\#{$baz}
@@ -1357,7 +1357,7 @@ SCSS
   end
 
   def test_media_with_expressions
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 $media1: screen
 $media2: print
 $var: -webkit-min-device-pixel-ratio
@@ -1378,7 +1378,7 @@ SCSS
   end
 
   def test_media_with_feature
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 @media screen and (-webkit-transform-3d)
   a: b
 SASS
@@ -1389,7 +1389,7 @@ SCSS
   end
 
   def test_supports_with_expressions
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 $query: "(feature1: val)"
 $feature: feature2
 $val: val
@@ -1413,7 +1413,7 @@ SCSS
   # Hacks
 
   def test_declaration_hacks
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 foo
   _name: val
   *name: val
@@ -1436,7 +1436,7 @@ SCSS
   end
 
   def test_old_declaration_hacks
-    silence_warnings {assert_renders <<SASS, <<SCSS, :old => true}
+    assert_converts <<SASS, <<SCSS, options: {old: true}
 foo
   :_name val
   :*name val
@@ -1456,7 +1456,7 @@ SCSS
 
   def test_selector_hacks
     assert_selector_renders = lambda do |s|
-      assert_renders <<SASS, <<SCSS
+      assert_converts <<SASS, <<SCSS
 #{s}
   a: b
 SASS
@@ -1483,7 +1483,7 @@ SCSS
   end
 
   def test_nested_properties
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 div
   before: before
   background:
@@ -1504,7 +1504,7 @@ SCSS
   end
 
   def test_dasherize
-    assert_sass_to_scss(<<SCSS, <<SASS, :dasherize => true)
+    assert_sass_to_scss(<<SCSS, <<SASS, options: {dasherize: true})
 @mixin under-scored-mixin($under-scored-arg: $under-scored-default) {
   bar: $under-scored-arg;
 }
@@ -1539,7 +1539,7 @@ SASS
   end
 
   def test_loud_comment_conversion
-    assert_renders(<<SASS, <<SCSS)
+    assert_converts(<<SASS, <<SCSS)
 /*! \#{"interpolated"}
 SASS
 /*! \#{"interpolated"} */
@@ -1547,7 +1547,7 @@ SCSS
   end
 
   def test_content_conversion
-    assert_renders(<<SASS, <<SCSS)
+    assert_converts(<<SASS, <<SCSS)
 $color: blue
 
 =context($class, $color: red)
@@ -1594,7 +1594,7 @@ SCSS
   end
 
   def test_placeholder_conversion
-    assert_renders(<<SASS, <<SCSS)
+    assert_converts(<<SASS, <<SCSS)
 #content a%foo.bar
   color: blue
 SASS
@@ -1605,7 +1605,7 @@ SCSS
   end
 
   def test_reference_selector
-    assert_renders(<<SASS, <<SCSS)
+    assert_converts(<<SASS, <<SCSS)
 foo /bar|baz/ bang
   a: b
 SASS
@@ -1616,7 +1616,7 @@ SCSS
   end
 
   def test_subject
-    assert_renders(<<SASS, <<SCSS)
+    assert_converts(<<SASS, <<SCSS)
 foo bar! baz
   a: b
 SASS
@@ -1627,7 +1627,7 @@ SCSS
   end
 
   def test_placeholder_interoplation_conversion
-    assert_renders(<<SASS, <<SCSS)
+    assert_converts(<<SASS, <<SCSS)
 $foo: foo
 
 %\#{$foo}
@@ -1649,7 +1649,7 @@ SCSS
   end
 
   def test_indent
-    assert_renders <<SASS, <<SCSS, :indent => "    "
+    assert_converts <<SASS, <<SCSS, options: {indent: "    "}
 foo bar
     baz bang
         baz: bang
@@ -1667,7 +1667,7 @@ foo bar {
 }
 SCSS
 
-    assert_renders <<SASS, <<SCSS, :indent => "\t"
+    assert_converts <<SASS, <<SCSS, options: {indent: "\t"}
 foo bar
 	baz bang
 		baz: bang
@@ -1685,7 +1685,7 @@ foo bar {
 }
 SCSS
 
-    assert_sass_to_scss <<SCSS, <<SASS, :indent => "    "
+    assert_sass_to_scss <<SCSS, <<SASS, options: {indent: "    "}
 foo bar {
     baz bang {
         baz: bang;
@@ -1703,7 +1703,7 @@ foo bar
   blat: boo
 SASS
 
-    assert_sass_to_scss <<SCSS, <<SASS, :indent => "\t"
+    assert_sass_to_scss <<SCSS, <<SASS, options: {indent: "\t"}
 foo bar {
 	baz bang {
 		baz: bang;
@@ -1721,7 +1721,7 @@ foo bar
   blat: boo
 SASS
 
-    assert_scss_to_sass <<SASS, <<SCSS, :indent => "    "
+    assert_scss_to_sass <<SASS, <<SCSS, options: {indent: "    "}
 foo bar
     baz bang
         baz: bang
@@ -1739,7 +1739,7 @@ foo bar {
 }
 SCSS
 
-    assert_scss_to_sass <<SASS, <<SCSS, :indent => "\t"
+    assert_scss_to_sass <<SASS, <<SCSS, options: {indent: "\t"}
 foo bar
 	baz bang
 		baz: bang
@@ -1759,7 +1759,7 @@ SCSS
   end
 
   def test_extend_with_optional
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 foo
   @extend .bar !optional
 SASS
@@ -1770,7 +1770,7 @@ SCSS
   end
 
   def test_mixin_var_args
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 =foo($args...)
   a: b
 
@@ -1799,7 +1799,7 @@ SCSS
   end
 
   def test_mixin_var_kwargs
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 =foo($a: b, $c: d)
   a: $a
   c: $c
@@ -1823,7 +1823,7 @@ SCSS
   end
 
   def test_function_var_args
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 @function foo($args...)
   @return foo
 
@@ -1850,7 +1850,7 @@ SCSS
   end
 
   def test_function_var_kwargs
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 @function foo($a: b, $c: d)
   @return foo
 
@@ -1870,7 +1870,7 @@ SCSS
   end
 
   def test_at_root
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 .foo
   @at-root
     .bar
@@ -1894,7 +1894,7 @@ SCSS
   end
 
   def test_at_root_with_selector
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 .foo
   @at-root .bar
     a: b
@@ -1908,7 +1908,7 @@ SCSS
   end
 
   def test_at_root_without
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 .foo
   @at-root (without: media rule)
     a: b
@@ -1922,7 +1922,7 @@ SCSS
   end
 
   def test_at_root_with
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 .foo
   @at-root (with: media rule)
     a: b
@@ -1936,7 +1936,7 @@ SCSS
   end
 
   def test_function_var_kwargs_with_list
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 @function foo($a: b, $c: d)
   @return $a, $c
 
@@ -1954,7 +1954,7 @@ SCSS
   end
 
   def test_keyframes
-    assert_renders(<<SASS, <<SCSS)
+    assert_converts(<<SASS, <<SCSS)
 @keyframes identifier
   0%
     top: 0
@@ -1995,7 +1995,7 @@ SCSS
   ## Regression Tests
 
   def test_list_in_args
-    assert_renders(<<SASS, <<SCSS)
+    assert_converts(<<SASS, <<SCSS)
 +mixin((a, b, c))
 
 +mixin($arg: (a, b, c))
@@ -2011,7 +2011,7 @@ SCSS
   end
 
   def test_media_query_with_expr
-    assert_renders <<SASS, <<SCSS
+    assert_converts <<SASS, <<SCSS
 @media foo and (bar: baz)
   a: b
 SASS
@@ -2022,7 +2022,7 @@ SCSS
   end
 
   def test_nested_if_statements
-    assert_renders(<<SASS, <<SCSS)
+    assert_converts(<<SASS, <<SCSS)
 @if $foo
   one
     a: b
@@ -2055,7 +2055,7 @@ SCSS
   end
 
   def test_comment_indentation
-    assert_renders(<<SASS, <<SCSS, :indent => '    ')
+    assert_converts(<<SASS, <<SCSS, options: {indent: '    '})
 foo
     // bar
     /* baz
@@ -2070,27 +2070,27 @@ SCSS
   end
 
   def test_keyword_arguments
-    assert_renders(<<SASS, <<SCSS, :dasherize => true)
+    assert_converts(<<SASS, <<SCSS, options: {dasherize: true})
 $foo: foo($dash-ed: 2px)
 SASS
 $foo: foo($dash-ed: 2px);
 SCSS
-    assert_scss_to_sass(<<SASS, <<SCSS, :dasherize => true)
+    assert_scss_to_sass(<<SASS, <<SCSS, options: {dasherize: true})
 $foo: foo($dash-ed: 2px)
 SASS
 $foo: foo($dash_ed: 2px);
 SCSS
-    assert_sass_to_scss(<<SCSS, <<SASS, :dasherize => true)
+    assert_sass_to_scss(<<SCSS, <<SASS, options: {dasherize: true})
 $foo: foo($dash-ed: 2px);
 SCSS
 $foo: foo($dash_ed: 2px)
 SASS
-    assert_renders(<<SASS, <<SCSS)
+    assert_converts(<<SASS, <<SCSS)
 $foo: foo($under_scored: 1px)
 SASS
 $foo: foo($under_scored: 1px);
 SCSS
-    assert_renders(<<SASS, <<SCSS)
+    assert_converts(<<SASS, <<SCSS)
 $foo: foo($dash-ed: 2px, $under_scored: 1px)
 SASS
 $foo: foo($dash-ed: 2px, $under_scored: 1px);
@@ -2098,7 +2098,7 @@ SCSS
   end
 
   def test_ambiguous_negation
-    assert_renders(<<SASS, <<SCSS, :indent => '    ')
+    assert_converts(<<SASS, <<SCSS, options: {indent: '    '})
 foo
     ok: -$foo
     comma: 10px, -$foo
@@ -2113,7 +2113,7 @@ SCSS
   end
 
   def test_variable_with_global
-    assert_renders(<<SASS, <<SCSS)
+    assert_converts(<<SASS, <<SCSS)
 $var: 1
 
 foo
@@ -2130,59 +2130,10 @@ SCSS
   end
 
   def test_import_with_supports_clause
-    assert_renders(<<'SASS', <<'SCSS')
+    assert_converts(<<'SASS', <<'SCSS')
 @import url("fallback-layout.css") supports(not (display: #{$display-type}))
 SASS
 @import url("fallback-layout.css") supports(not (display: #{$display-type}));
 SCSS
   end
-
-  private
-
-  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, in_scss = nil, options = nil)
-    if in_scss.is_a?(Hash)
-      options = in_scss
-      in_scss = nil
-    end
-
-    in_scss ||= scss
-    options ||= {}
-
-    assert_equal(scss.rstrip, to_scss(in_scss, options.merge(:syntax => :scss)).rstrip,
-      "Expected SCSS to transform to #{scss == in_scss ? '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_renders(sass, scss, options = {})
-    assert_sass_to_sass(sass, options)
-    assert_scss_to_sass(sass, scss, options)
-    assert_scss_to_scss(scss, options)
-    assert_sass_to_scss(scss, sass, 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