sass 3.1.21 → 3.2.0.alpha.3

data/test/sass/importer_test.rb

@@ -2,8 +2,6 @@
 require File.dirname(__FILE__) + '/../test_helper'
 require File.dirname(__FILE__) + '/test_helper'
 
-require 'sass/plugin'
-
 class ImporterTest < Test::Unit::TestCase
   
   class FruitImporter < Sass::Importers::Base
@@ -40,72 +38,6 @@ class ImporterTest < Test::Unit::TestCase
     end
   end
 
-  # This importer maps one import to another import
-  # based on the mappings passed to importer's constructor.
-  class IndirectImporter < Sass::Importers::Base
-    def initialize(mappings, mtimes)
-      @mappings = mappings
-      @mtimes = mtimes
-    end
-    def find_relative(uri, base, options)
-      nil
-    end
-    def find(name, options)
-      if @mappings.has_key?(name)
-        Sass::Engine.new(
-          %Q[@import "#{@mappings[name]}";],
-          options.merge(
-            :filename => name,
-            :syntax => :scss,
-            :importer => self
-          )
-        )
-      end
-    end
-    def mtime(uri, options)
-      @mtimes.fetch(uri, @mtimes.has_key?(uri) ? Time.now : nil)
-    end
-    def key(uri, options)
-      [self.class.name, uri]
-    end
-    def to_s
-      "IndirectImporter(#{@mappings.keys.join(", ")})"
-    end
-  end
-
-  # This importer maps the import to single class
-  # based on the mappings passed to importer's constructor.
-  class ClassImporter < Sass::Importers::Base
-    def initialize(mappings, mtimes)
-      @mappings = mappings
-      @mtimes = mtimes
-    end
-    def find_relative(uri, base, options)
-      nil
-    end
-    def find(name, options)
-      if @mappings.has_key?(name)
-        Sass::Engine.new(
-          %Q[.#{name}{#{@mappings[name]}}],
-          options.merge(
-            :filename => name,
-            :syntax => :scss,
-            :importer => self
-          )
-        )
-      end
-    end
-    def mtime(uri, options)
-      @mtimes.fetch(uri, @mtimes.has_key?(uri) ? Time.now : nil)
-    end
-    def key(uri, options)
-      [self.class.name, uri]
-    end
-    def to_s
-      "ClassImporter(#{@mappings.keys.join(", ")})"
-    end
-  end
-
   def test_can_resolve_generated_imports
     scss_file = %Q{
       $pear-color: green;
@@ -147,46 +79,4 @@ CSS
   ensure
     FileUtils.rm_rf(absolutize("tmp"))
   end
-
-  def test_staleness_check_across_importers
-    file_system_importer = Sass::Importers::Filesystem.new(fixture_dir)
-    # Make sure the first import is older
-    indirect_importer = IndirectImporter.new({"apple" => "pear"}, {"apple" => Time.now - 1})
-    # Make css file is newer so the dependencies are the only way for the css file to be out of date.
-    FileUtils.touch(fixture_file("test_staleness_check_across_importers.css"))
-    # Make sure the first import is older
-    class_importer = ClassImporter.new({"pear" => %Q{color: green;}}, {"pear" => Time.now + 1})
-
-    options = {
-      :style => :compact,
-      :filename => fixture_file("test_staleness_check_across_importers.scss"),
-      :importer => file_system_importer,
-      :load_paths => [file_system_importer, indirect_importer, class_importer],
-      :syntax => :scss
-    }
-
-    assert_equal File.read(fixture_file("test_staleness_check_across_importers.css")),
-                 Sass::Engine.new(File.read(fixture_file("test_staleness_check_across_importers.scss")), options).render
-
-    checker = Sass::Plugin::StalenessChecker.new(options)
-
-    assert checker.stylesheet_needs_update?(
-      fixture_file("test_staleness_check_across_importers.css"),
-      fixture_file("test_staleness_check_across_importers.scss"),
-      file_system_importer
-    )
-  end
-
-  def fixture_dir
-    File.join(File.dirname(__FILE__), "fixtures")
-  end
-
-  def fixture_file(path)
-    File.join(fixture_dir, path)
-  end
-
-  def test_absolute_files_across_template_locations
-    importer = Sass::Importers::Filesystem.new(absolutize 'templates')
-    assert_not_nil importer.mtime(absolutize('more_templates/more1.sass'), {})
-  end
 end

data/test/sass/more_results/more_import.css

@@ -1,5 +1,3 @@
-@import url(basic.css);
-@import url(../results/complex.css);
 imported { otherconst: hello; myconst: goodbye; pre-mixin: here; }
 
 body { font: Arial; background: blue; }
@@ -24,6 +22,8 @@ body { font: Arial; background: blue; }
 #content.user.show #container.top #column.right { width: 600px; }
 #content.user.show #container.bottom { background: brown; }
 
+@import url(basic.css);
+@import url(../results/complex.css);
 #foo { background-color: #bbaaff; }
 
 nonimported { myconst: hello; otherconst: goodbye; post-mixin: here; }

data/test/sass/plugin_test.rb

@@ -110,30 +110,6 @@ CSS
     File.delete(tempfile_loc('bork1'))
   end
 
-  def test_single_level_import_loop
-    File.delete(tempfile_loc('single_import_loop'))
-    check_for_updates!
-    File.open(tempfile_loc('single_import_loop')) do |file|
-      assert_equal(<<CSS.strip, file.read.split("\n")[0...2].join("\n"))
-/*
-Sass::SyntaxError: An @import loop has been found: #{template_loc('single_import_loop')} imports itself
-CSS
-    end
-  end
-
-  def test_double_level_import_loop
-    File.delete(tempfile_loc('double_import_loop1'))
-    check_for_updates!
-    File.open(tempfile_loc('double_import_loop1')) do |file|
-      assert_equal(<<CSS.strip, file.read.split("\n")[0...4].join("\n"))
-/*
-Sass::SyntaxError: An @import loop has been found:
-    #{template_loc('double_import_loop1')} imports #{template_loc('_double_import_loop2')}
-    #{template_loc('_double_import_loop2')} imports #{template_loc('double_import_loop1')}
-CSS
-    end
-  end
-
   def test_nonfull_exception_handling
     old_full_exception = Sass::Plugin.options[:full_exception]
     Sass::Plugin.options[:full_exception] = false
@@ -207,7 +183,6 @@ CSS
 
   def test_updating_stylesheets_callback
     # Should run even when there's nothing to update
-    Sass::Plugin.options[:template_location] = nil
     assert_callback :updating_stylesheets, []
   end
 
@@ -221,25 +196,25 @@ CSS
     assert_no_callback :updating_stylesheets
   end
 
-  def test_updated_stylesheet_callback_for_updated_template
+  def test_updating_stylesheet_callback_for_updated_template
     Sass::Plugin.options[:always_update] = false
     touch 'basic'
-    assert_no_callback :updated_stylesheet, template_loc("complex"), tempfile_loc("complex") do
+    assert_no_callback :updating_stylesheet, template_loc("complex"), tempfile_loc("complex") do
       assert_callbacks(
-        [:updated_stylesheet, template_loc("basic"), tempfile_loc("basic")],
-        [:updated_stylesheet, template_loc("import"), tempfile_loc("import")])
+        [:updating_stylesheet, template_loc("basic"), tempfile_loc("basic")],
+        [:updating_stylesheet, template_loc("import"), tempfile_loc("import")])
     end
   end
 
-  def test_updated_stylesheet_callback_for_fresh_template
+  def test_updating_stylesheet_callback_for_fresh_template
     Sass::Plugin.options[:always_update] = false
-    assert_no_callback :updated_stylesheet
+    assert_no_callback :updating_stylesheet
   end
 
-  def test_updated_stylesheet_callback_for_error_template
+  def test_updating_stylesheet_callback_for_error_template
     Sass::Plugin.options[:always_update] = false
     touch 'bork1'
-    assert_no_callback :updated_stylesheet
+    assert_no_callback :updating_stylesheet
   end
 
   def test_not_updating_stylesheet_callback_for_fresh_template
@@ -251,8 +226,8 @@ CSS
     Sass::Plugin.options[:always_update] = false
     assert_callback :not_updating_stylesheet, template_loc("complex"), tempfile_loc("complex") do
       assert_no_callbacks(
-        [:updated_stylesheet, template_loc("basic"), tempfile_loc("basic")],
-        [:updated_stylesheet, template_loc("import"), tempfile_loc("import")])
+        [:updating_stylesheet, template_loc("basic"), tempfile_loc("basic")],
+        [:updating_stylesheet, template_loc("import"), tempfile_loc("import")])
     end
   end
 
@@ -372,11 +347,9 @@ CSS
 
   def assert_callback(name, *expected_args)
     run = false
-    received_args = nil
     Sass::Plugin.send("on_#{name}") do |*args|
-      received_args = args
-      run ||= expected_args.zip(received_args).all? do |ea, ra|
-        ea.respond_to?(:call) ? ea.call(ra) : ea == ra
+      run ||= expected_args.zip(args).all? do |ea, a|
+        ea.respond_to?(:call) ? ea.call(a) : ea == a
       end
     end
 
@@ -386,7 +359,7 @@ CSS
       check_for_updates!
     end
 
-    assert run, "Expected #{name} callback to be run with arguments:\n  #{expected_args.inspect}\nHowever, it got:\n  #{received_args.inspect}"
+    assert run, "Expected #{name} callback to be run with arguments:\n  #{expected_args.inspect}"
   end
 
   def assert_no_callback(name, *unexpected_args)

data/test/sass/results/import.css

@@ -1,5 +1,3 @@
-@import url(basic.css);
-@import url(../results/complex.css);
 imported { otherconst: hello; myconst: goodbye; pre-mixin: here; }
 
 body { font: Arial; background: blue; }
@@ -26,6 +24,8 @@ body { font: Arial; background: blue; }
 #content.user.show #container.top #column.right { width: 600px; }
 #content.user.show #container.bottom { background: brown; }
 
+@import url(basic.css);
+@import url(../results/complex.css);
 #foo { background-color: #bbaaff; }
 
 nonimported { myconst: hello; otherconst: goodbye; post-mixin: here; }

data/test/sass/results/import_charset.css

@@ -1,5 +1,4 @@
 @charset "UTF-8";
-@import url(foo.css);
 .foo { a: b; }
 
 .bar { a: щ; }

data/test/sass/results/import_charset_1_8.css

@@ -1,5 +1,4 @@
 @charset "IBM866";
-@import url(foo.css);
 .foo { a: b; }
 
 .bar { a: �; }

data/test/sass/results/import_charset_ibm866.css

@@ -1,5 +1,4 @@
 @charset "IBM866";
-@import url(foo.css);
 .foo { a: b; }
 
 .bar { a: �; }

data/test/sass/results/scss_import.css

@@ -1,5 +1,3 @@
-@import url(basic.css);
-@import url(../results/complex.css);
 imported { otherconst: hello; myconst: goodbye; pre-mixin: here; }
 
 body { font: Arial; background: blue; }
@@ -26,6 +24,8 @@ body { font: Arial; background: blue; }
 #content.user.show #container.top #column.right { width: 600px; }
 #content.user.show #container.bottom { background: brown; }
 
+@import url(basic.css);
+@import url(../results/complex.css);
 #foo { background-color: #bbaaff; }
 
 nonimported { myconst: hello; otherconst: goodbye; post-mixin: here; }

data/test/sass/results/units.css

@@ -8,4 +8,4 @@ b {
   pt: -72pt;
   inches: 2in;
   more-inches: 3.5in;
-  mixed: 2.042in; }
+  mixed: 6px; }

data/test/sass/script_conversion_test.rb

@@ -223,8 +223,6 @@ RUBY
     assert_renders '#{1 + 2}, #{3 + 4}'
     assert_renders '#{1 + 2} ,#{3 + 4}'
     assert_renders '#{1 + 2},#{3 + 4}'
-    assert_renders '#{1 + 2}, #{3 + 4}, #{5 + 6}'
-    assert_renders '3, #{3 + 4}, 11'
 
     assert_renders '3 / #{3 + 4}'
     assert_renders '3 /#{3 + 4}'

data/test/sass/script_test.rb

@@ -7,27 +7,19 @@ module Sass::Script::Functions::UserFunctions
     val.options[:foo]
     Sass::Script::String.new("Options defined!")
   end
-
-  def arg_error
-    assert_options
-  end
-end
-
-module Sass::Script::Functions
-  include Sass::Script::Functions::UserFunctions
 end
 
 class SassScriptTest < Test::Unit::TestCase
   include Sass::Script
 
   def test_color_checks_input
-    assert_raise_message(ArgumentError, "Blue value -1 must be between 0 and 255") {Color.new([1, 2, -1])}
-    assert_raise_message(ArgumentError, "Red value 256 must be between 0 and 255") {Color.new([256, 2, 3])}
+    assert_raise_message(ArgumentError, "Blue value must be between 0 and 255") {Color.new([1, 2, -1])}
+    assert_raise_message(ArgumentError, "Red value must be between 0 and 255") {Color.new([256, 2, 3])}
   end
 
   def test_color_checks_rgba_input
-    assert_raise_message(ArgumentError, "Alpha channel 1.1 must be between 0 and 1") {Color.new([1, 2, 3, 1.1])}
-    assert_raise_message(ArgumentError, "Alpha channel -0.1 must be between 0 and 1") {Color.new([1, 2, 3, -0.1])}
+    assert_raise_message(ArgumentError, "Alpha channel must be between 0 and 1") {Color.new([1, 2, 3, 1.1])}
+    assert_raise_message(ArgumentError, "Alpha channel must be between 0 and 1") {Color.new([1, 2, 3, -0.1])}
   end
 
   def test_string_escapes
@@ -138,8 +130,6 @@ class SassScriptTest < Test::Unit::TestCase
     assert_equal '3, 7', resolve('#{1 + 2}, #{3 + 4}')
     assert_equal '3 ,7', resolve('#{1 + 2} ,#{3 + 4}')
     assert_equal '3,7', resolve('#{1 + 2},#{3 + 4}')
-    assert_equal '3, 7, 11', resolve('#{1 + 2}, #{3 + 4}, #{5 + 6}')
-    assert_equal '3, 7, 11', resolve('3, #{3 + 4}, 11')
 
     assert_equal '3 / 7', resolve('3 / #{3 + 4}')
     assert_equal '3 /7', resolve('3 /#{3 + 4}')
@@ -359,7 +349,6 @@ SASS
 
   def test_operator_unit_conversion
     assert_equal "1.1cm", resolve("1cm + 1mm")
-    assert_equal "2in", resolve("1in + 96px")
     assert_equal "true", resolve("2mm < 1cm")
     assert_equal "true", resolve("10mm == 1cm")
     assert_equal "true", resolve("1 == 1cm")
@@ -425,19 +414,6 @@ SASS
     assert_raise_message(Sass::SyntaxError, "() isn't a valid CSS value.") {resolve("nth(append((), ()), 1)")}
   end
 
-  def test_deep_argument_error_not_unwrapped
-    assert_raise_message(ArgumentError, 'wrong number of arguments (0 for 1)') {resolve("arg-error()")}
-  end
-
-  def test_shallow_argument_error_unwrapped
-    assert_raise_message(Sass::SyntaxError, "wrong number of arguments (1 for 0) for `arg-error'") {resolve("arg-error(1)")}
-  end
-
-  def test_boolean_ops_short_circuit
-    assert_equal "false", resolve("$ie and $ie <= 7", {}, env('ie' => Sass::Script::Bool.new(false)))
-    assert_equal "true", resolve("$ie or $undef", {}, env('ie' => Sass::Script::Bool.new(true)))
-  end
-
   # Regression Tests
 
   def test_funcall_has_higher_precedence_than_color_name

data/test/sass/scss/css_test.rb

@@ -412,15 +412,6 @@ foo {
 SCSS
   end
 
-  def test_element_function
-    assert_parses <<SCSS
-foo {
-  a: -moz-element(#foo);
-  b: -webkit-element(#foo);
-  b: -foobar-element(#foo); }
-SCSS
-  end
-
   def test_unary_ops
     assert_equal <<CSS, render(<<SCSS)
 foo {
@@ -595,50 +586,6 @@ CSS
 SCSS
   end
 
-  def test_moz_document_directive
-    assert_equal <<CSS, render(<<SCSS)
-@-moz-document url(http://www.w3.org/),
-               url-prefix(http://www.w3.org/Style/),
-               domain(mozilla.org),
-               regexp("^https:.*") {
-  .foo {
-    a: b; } }
-CSS
-@-moz-document url(http://www.w3.org/),
-               url-prefix(http://www.w3.org/Style/),
-               domain(mozilla.org),
-               regexp("^https:.*") {
-  .foo {a: b}
-}
-SCSS
-  end
-
-  def test_supports
-    assert_equal <<CSS, render(<<SCSS)
-@supports (a: b) and (c: d) or (not (d: e)) and ((not (f: g)) or (not ((h: i) and (j: k)))) {
-  .foo {
-    a: b; } }
-CSS
-@supports (a: b) and (c: d) or (not (d: e)) and ((not (f: g)) or (not ((h: i) and (j: k)))) {
-  .foo {
-    a: b;
-  }
-}
-SCSS
-
-    assert_equal <<CSS, render(<<SCSS)
-@-prefix-supports (a: b) and (c: d) or (not (d: e)) and ((not (f: g)) or (not ((h: i) and (j: k)))) {
-  .foo {
-    a: b; } }
-CSS
-@-prefix-supports (a: b) and (c: d) or (not (d: e)) and ((not (f: g)) or (not ((h: i) and (j: k)))) {
-  .foo {
-    a: b;
-  }
-}
-SCSS
-  end
-
   ## Selectors
 
   # Taken from http://www.w3.org/TR/css3-selectors/#selectors
@@ -853,12 +800,6 @@ SCSS
     assert_selector_parses('E*:hover')
   end
 
-  def test_spaceless_combo_selectors
-    assert_equal "E > F {\n  a: b; }\n", render("E>F { a: b;} ")
-    assert_equal "E ~ F {\n  a: b; }\n", render("E~F { a: b;} ")
-    assert_equal "E + F {\n  a: b; }\n", render("E+F { a: b;} ")
-  end
-
   ## Errors
 
   def test_invalid_directives
@@ -946,10 +887,6 @@ SCSS
 
   ## Regressions
 
-  def test_selector_without_closing_bracket
-    assert_not_parses('"]"', "foo[bar <err>{a: b}")
-  end
-
   def test_closing_line_comment_end_with_compact_output
     assert_equal(<<CSS, render(<<SCSS, :style => :compact))
 /* foo */
@@ -962,21 +899,6 @@ bar {baz: bang}
 SCSS
   end
 
-  def test_single_line_comment_within_multiline_comment
-    assert_equal(<<CSS, render(<<SCSS))
-body {
-  /*
-  //comment here
-  */ }
-CSS
-body {
-  /*
-  //comment here
-  */
-}
-SCSS
-  end
-
   private
 
   def assert_selector_parses(selector)
@@ -987,7 +909,7 @@ SCSS
   end
 
   def render(scss, options = {})
-    tree = Sass::SCSS::CssParser.new(scss, options[:filename]).parse
+    tree = Sass::SCSS::CssParser.new(scss).parse
     tree.options = Sass::Engine::DEFAULT_OPTIONS.merge(options)
     tree.render
   end