sass 3.2.19 → 3.3.0.alpha.1

data/test/sass/plugin_test.rb

@@ -9,12 +9,6 @@ module Sass::Script::Functions
     filename = options[:filename].gsub(%r{.*((/[^/]+){4})}, '\1')
     Sass::Script::String.new(filename)
   end
-
-  def whatever
-    custom = options[:custom]
-    whatever = custom && custom[:whatever]
-    Sass::Script::String.new(whatever || "incorrect")
-  end
 end
 
 class SassPluginTest < Test::Unit::TestCase
@@ -123,30 +117,13 @@ CSS
     File.delete(tempfile_loc('bork1'))
   end
 
-  def test_full_exception_with_block_comment
-    File.delete(tempfile_loc('bork5'))
-    check_for_updates!
-    File.open(tempfile_loc('bork5')) do |file|
-      assert_equal(<<CSS.strip, file.read.split("\n")[0...7].join("\n"))
-/*
-Syntax error: Undefined variable: "$bork".
-        on line 3 of #{template_loc('bork5')}
-
-1: bork
-2:   /* foo *\\/
-3:   :bork $bork
-CSS
-    end
-    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"))
 /*
-Syntax error: An @import loop has been found: #{template_loc('single_import_loop')} imports itself
+Sass::SyntaxError: An @import loop has been found: #{template_loc('single_import_loop')} imports itself
 CSS
     end
   end
@@ -157,23 +134,9 @@ CSS
     File.open(tempfile_loc('double_import_loop1')) do |file|
       assert_equal(<<CSS.strip, file.read.split("\n")[0...4].join("\n"))
 /*
-Syntax error: 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_import_name_cleanup
-    File.delete(tempfile_loc('subdir/import_up1'))
-    check_for_updates!
-    File.open(tempfile_loc('subdir/import_up1')) do |file|
-      assert_equal(<<CSS.strip, file.read.split("\n")[0...5].join("\n"))
-/*
-Syntax error: File to import not found or unreadable: ../subdir/import_up3.scss.
-              Load path: #{template_loc}
-        on line 1 of #{template_loc 'subdir/import_up2'}
-        from line 1 of #{template_loc 'subdir/import_up1'}
+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
@@ -247,18 +210,6 @@ CSS
     assert_needs_update "basic"
   end
 
-  def test_import_same_name
-    assert_warning <<WARNING do
-WARNING: In #{template_loc}:
-  There are multiple files that match the name "same_name_different_partiality.scss":
-    _same_name_different_partiality.scss
-    same_name_different_partiality.scss
-WARNING
-      touch "_same_name_different_partiality"
-      assert_needs_update "same_name_different_partiality"
-    end
-  end
-
   # Callbacks
 
   def test_updating_stylesheets_callback
@@ -267,6 +218,11 @@ WARNING
     assert_callback :updating_stylesheets, []
   end
 
+  def test_updating_stylesheets_callback_with_individual_files
+    files = [[template_loc("basic"), tempfile_loc("basic")]]
+    assert_callback(:updating_stylesheets, files) {Sass::Util.silence_sass_warnings{Sass::Plugin.update_stylesheets(files)}}
+  end
+
   def test_updating_stylesheets_callback_with_never_update
     Sass::Plugin.options[:never_update] = true
     assert_no_callback :updating_stylesheets
@@ -377,24 +333,7 @@ WARNING
     check_for_updates!
     assert_renders_correctly 'if'
   ensure
-    set_plugin_opts
-  end
-
-  def test_cached_import_option
-    set_plugin_opts :custom => {:whatever => "correct"}
-    check_for_updates!
-    assert_renders_correctly "cached_import_option"
-
-    @@cache_store.reset!
-    set_plugin_opts :custom => nil, :always_update => false
-    check_for_updates!
-    assert_renders_correctly "cached_import_option"
-
-    set_plugin_opts :custom => {:whatever => "correct"}, :always_update => true
-    check_for_updates!
-    assert_renders_correctly "cached_import_option"
-  ensure
-    set_plugin_opts :custom => nil
+    set_plugin_opts :cache_store => @@cache_store
   end
 
  private
@@ -449,7 +388,7 @@ WARNING
     end
 
     if block_given?
-      Sass::Util.silence_sass_warnings {yield}
+      yield
     else
       check_for_updates!
     end

data/test/sass/script_conversion_test.rb

@@ -69,20 +69,6 @@ class SassScriptConversionTest < Test::Unit::TestCase
     assert_renders "$flaznicate"
   end
 
-  def test_null
-    assert_renders "null"
-  end
-
-  def test_empty_list
-    assert_renders "()"
-  end
-
-  def test_list_in_args
-    assert_renders "foo((a, b, c))"
-    assert_renders "foo($arg: (a, b, c))"
-    assert_renders "foo(a, b, (a, b, c)...)"
-  end
-
   def self.test_precedence(outer, inner)
     op_outer = Sass::Script::Lexer::OPERATORS_REVERSE[outer]
     op_inner = Sass::Script::Lexer::OPERATORS_REVERSE[inner]

data/test/sass/script_test.rb

@@ -134,7 +134,6 @@ class SassScriptTest < Test::Unit::TestCase
     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, 11', resolve('3, 7, #{5 + 6}')
 
     assert_equal '3 / 7', resolve('3 / #{3 + 4}')
     assert_equal '3 /7', resolve('3 /#{3 + 4}')
@@ -490,13 +489,7 @@ SASS
   end
 
   def test_deep_argument_error_not_unwrapped
-    # JRuby (as of 1.6.7.2) offers no way of distinguishing between
-    # argument errors caused by programming errors in a function and
-    # argument errors explicitly thrown within that function.
-    return if RUBY_PLATFORM =~ /java/
-
-    # Don't validate the message; it's different on Rubinius.
-    assert_raise(ArgumentError) {resolve("arg-error()")}
+    assert_raise_message(ArgumentError, 'wrong number of arguments (0 for 1)') {resolve("arg-error()")}
   end
 
   def test_shallow_argument_error_unwrapped
@@ -510,30 +503,6 @@ SASS
 
   # Regression Tests
 
-  def test_user_defined_function_forces_division
-    assert_equal(<<CSS, render(<<SASS))
-a {
-  b: 10px; }
-CSS
-@function foo()
-  @return 20px
-
-a
-  b: (foo() / 2)
-SASS
-
-    assert_equal(<<CSS, render(<<SASS))
-a {
-  b: 10px; }
-CSS
-@function foo()
-  @return 20px
-
-a
-  b: foo() / 2
-SASS
-end
-
   def test_funcall_has_higher_precedence_than_color_name
     assert_equal "teal(12)", resolve("teal(12)")
     assert_equal "tealbang(12)", resolve("tealbang(12)")
@@ -541,13 +510,6 @@ end
     assert_equal "teal\\+bang(12)", resolve("teal\\+bang(12)")
   end
 
-  def test_funcall_has_higher_precedence_than_true_false_null
-    assert_equal "teal(12)", resolve("teal(12)")
-    assert_equal "tealbang(12)", resolve("tealbang(12)")
-    assert_equal "teal-bang(12)", resolve("teal-bang(12)")
-    assert_equal "teal\\+bang(12)", resolve("teal\\+bang(12)")
-  end
-
   def test_interpolation_after_hash
     assert_equal "#2", resolve('"##{1 + 1}"')
   end
@@ -574,7 +536,6 @@ end
   def resolve(str, opts = {}, environment = env)
     munge_filename opts
     val = eval(str, opts, environment)
-    assert_kind_of Sass::Script::Literal, val
     val.is_a?(Sass::Script::String) ? val.value : val.to_s
   end
 

data/test/sass/scss/css_test.rb

@@ -425,7 +425,7 @@ SCSS
     assert_equal <<CSS, render(<<SCSS)
 foo {
   a: -0.5em;
-  b: +0.5em;
+  b: 0.5em;
   c: -foo(12px);
   d: +foo(12px); }
 CSS
@@ -505,20 +505,13 @@ SCSS
     assert_parses '@import url(foo.css);'
   end
 
-  def test_string_import_directive_with_media
+  def test_import_directive_with_media
     assert_parses '@import "foo.css" screen;'
     assert_parses '@import "foo.css" screen, print;'
     assert_parses '@import "foo.css" screen, print and (foo: 0);'
     assert_parses '@import "foo.css" screen, only print, screen and (foo: 0);'
   end
 
-  def test_url_import_directive_with_media
-    assert_parses '@import url("foo.css") screen;'
-    assert_parses '@import url("foo.css") screen, print;'
-    assert_parses '@import url("foo.css") screen, print and (foo: 0);'
-    assert_parses '@import url("foo.css") screen, only print, screen and (foo: 0);'
-  end
-
   def test_page_directive
     assert_parses <<SCSS
 @page {
@@ -732,7 +725,7 @@ SCSS
 
   # Taken from http://dev.w3.org/csswg/selectors4/#overview, but without element
   # names.
-  def test_more_summarized_selectors
+  def test_summarized_selectors
     assert_selector_parses(':not(s)')
     assert_selector_parses(':not(s1, s2)')
     assert_selector_parses(':matches(s1, s2)')
@@ -1018,28 +1011,6 @@ SCSS
 
   ## Regressions
 
-  def test_double_space_string
-    assert_equal(<<CSS, render(<<SCSS))
-.a {
-  content: "  a"; }
-CSS
-.a {
-  content: "  a";
-}
-SCSS
-  end
-
-  def test_very_long_number_with_important_doesnt_take_forever
-    assert_equal(<<CSS, render(<<SCSS))
-.foo {
-  width: 97.916666666666666666666666666667% !important; }
-CSS
-.foo {
-  width: 97.916666666666666666666666666667% !important;
-}
-SCSS
-  end
-
   def test_selector_without_closing_bracket
     assert_not_parses('"]"', "foo[bar <err>{a: b}")
   end
@@ -1071,18 +1042,6 @@ body {
 SCSS
   end
 
-  def test_malformed_media
-    render <<SCSS
-@media {
-  margin: 0;
-}
-SCSS
-    assert(false, "Expected syntax error")
-  rescue Sass::SyntaxError => e
-    assert_equal 'Invalid CSS after "@media ": expected media query (e.g. print, screen, print and screen), was "{"', e.message
-    assert_equal 1, e.sass_line
-  end
-
   private
 
   def assert_selector_parses(selector)

data/test/sass/scss/scss_test.rb

@@ -270,20 +270,6 @@ SCSS
     assert_equal "@import url(foo.css);\n", render('@import url(foo.css);')
   end
 
-  def test_css_string_import_directive_with_media
-    assert_parses '@import "foo.css" screen;'
-    assert_parses '@import "foo.css" screen, print;'
-    assert_parses '@import "foo.css" screen, print and (foo: 0);'
-    assert_parses '@import "foo.css" screen, only print, screen and (foo: 0);'
-  end
-
-  def test_css_url_import_directive_with_media
-    assert_parses '@import url("foo.css") screen;'
-    assert_parses '@import url("foo.css") screen, print;'
-    assert_parses '@import url("foo.css") screen, print and (foo: 0);'
-    assert_parses '@import url("foo.css") screen, only print, screen and (foo: 0);'
-  end
-
   def test_media_import
     assert_equal("@import \"./fonts.sass\" all;\n", render("@import \"./fonts.sass\" all;"))
   end
@@ -304,11 +290,6 @@ SCSS
       render("@import \"http://fonts.googleapis.com/css?family=Droid+Sans\";"))
   end
 
-  def test_protocol_relative_import
-    assert_equal("@import \"//fonts.googleapis.com/css?family=Droid+Sans\";\n",
-      render("@import \"//fonts.googleapis.com/css?family=Droid+Sans\";"))
-  end
-
   def test_import_with_interpolation
     assert_equal <<CSS, render(<<SCSS)
 @import url("http://fonts.googleapis.com/css?family=Droid+Sans");
@@ -322,44 +303,6 @@ SCSS
     assert_equal("@import url(fonts.sass);\n", render("@import url(fonts.sass);"))
   end
 
-  def test_css_import_doesnt_move_through_comments
-    assert_equal <<CSS, render(<<SCSS)
-/* Comment 1 */
-@import url("foo.css");
-/* Comment 2 */
-@import url("bar.css");
-CSS
-/* Comment 1 */
-@import url("foo.css");
-
-/* Comment 2 */
-@import url("bar.css");
-SCSS
-  end
-
-  def test_css_import_movement_stops_at_comments
-    assert_equal <<CSS, render(<<SCSS)
-/* Comment 1 */
-@import url("foo.css");
-/* Comment 2 */
-@import url("bar.css");
-.foo {
-  a: b; }
-
-/* Comment 3 */
-CSS
-/* Comment 1 */
-@import url("foo.css");
-
-/* Comment 2 */
-
-.foo {a: b}
-
-/* Comment 3 */
-@import url("bar.css");
-SCSS
-  end
-
   def test_block_comment_in_script
     assert_equal <<CSS, render(<<SCSS)
 foo {
@@ -1721,7 +1664,7 @@ SCSS
     assert_raise_message(Sass::SyntaxError, <<MESSAGE.rstrip) {render <<SCSS}
 Invalid CSS after "  .foo": expected "{", was "&.bar {a: b}"
 
-"&.bar" may only be used at the beginning of a compound selector.
+"&.bar" may only be used at the beginning of a selector.
 MESSAGE
 flim {
   .foo&.bar {a: b}
@@ -1733,7 +1676,7 @@ SCSS
     assert_raise_message(Sass::SyntaxError, <<MESSAGE.rstrip) {render <<SCSS}
 Invalid CSS after "  .foo.bar": expected "{", was "& {a: b}"
 
-"&" may only be used at the beginning of a compound selector.
+"&" may only be used at the beginning of a selector.
 MESSAGE
 flim {
   .foo.bar& {a: b}
@@ -1745,7 +1688,7 @@ SCSS
     assert_raise_message(Sass::SyntaxError, <<MESSAGE.rstrip) {render <<SCSS}
 Invalid CSS after "  &": expected "{", was "& {a: b}"
 
-"&" may only be used at the beginning of a compound selector.
+"&" may only be used at the beginning of a selector.
 MESSAGE
 flim {
   && {a: b}
@@ -1762,60 +1705,6 @@ SCSS
   end
 
   # Regression
- 
-  def test_parent_ref_with_newline
-    assert_equal(<<CSS, render(<<SCSS))
-a.c
-, b.c {
-  x: y; }
-CSS
-a
-, b {&.c {x: y}}
-SCSS
-  end
-
-  def test_loud_comment_in_compressed_mode
-    assert_equal(<<CSS, render(<<SCSS))
-/*! foo */
-CSS
-/*! foo */
-SCSS
-  end
-
-  def test_parsing_decimals_followed_by_comments_doesnt_take_forever
-    assert_equal(<<CSS, render(<<SCSS))
-.foo {
-  padding: 4.21053% 4.21053% 5.63158%; }
-CSS
-.foo {
-  padding: 4.21052631578947% 4.21052631578947% 5.631578947368421% /**/
-}
-SCSS
-  end
-
-  def test_parsing_many_numbers_doesnt_take_forever
-    values = ["80% 90%"] * 1000
-    assert_equal(<<CSS, render(<<SCSS))
-.foo {
-  padding: #{values.join(', ')}; }
-CSS
-.foo {
-  padding: #{values.join(', ')};
-}
-SCSS
-  end
-
-  def test_import_comments_in_imports
-    assert_equal(<<CSS, render(<<SCSS))
-@import url(foo.css);
-@import url(bar.css);
-@import url(baz.css);
-CSS
-@import "foo.css", // this is a comment
-        "bar.css", /* this is another comment */
-        "baz.css"; // this is a third comment
-SCSS
-  end
 
   def test_reference_combinator_with_parent_ref
     assert_equal <<CSS, render(<<SCSS)
@@ -2083,24 +1972,4 @@ SCSS
 SCSS
     Sass::SCSS::Parser.new(template, "test.scss").parse
   end
-
-  def test_extend_in_media_in_rule
-    assert_equal(<<CSS, render(<<SCSS))
-@media screen {
-  .foo {
-    a: b; } }
-CSS
-.foo {
-  @media screen {
-    @extend %bar;
-  }
-}
-
-@media screen {
-  %bar {
-    a: b;
-  }
-}
-SCSS
-  end
 end