test/sass/script_conversion_test.rb in sass-3.4.19 vs test/sass/script_conversion_test.rb in sass-3.4.20

@@ -262,24 +262,25 @@
     assert_equal 'not true or false', render('(not true) or false')
     assert_equal 'not (true or false)', render('not (true or false)')
   end
 
   def test_interpolation
-    assert_renders "$foo\#{$bar}$baz"
-    assert_renders "$foo\#{$bar} $baz"
-    assert_renders "$foo \#{$bar}$baz"
+    assert_equal 'unquote("#{$foo}#{$bar}#{$baz}")', render("$foo\#{$bar}$baz")
+    assert_equal 'unquote("#{$foo}#{$bar} #{$baz}")', render("$foo\#{$bar} $baz")
+    assert_equal 'unquote("#{$foo} #{$bar}#{$baz}")', render("$foo \#{$bar}$baz")
     assert_renders "$foo \#{$bar} $baz"
     assert_renders "$foo \#{$bar}\#{$bang} $baz"
     assert_renders "$foo \#{$bar} \#{$bang} $baz"
-    assert_renders "\#{$bar}$baz"
-    assert_renders "$foo\#{$bar}"
+    assert_equal 'unquote("#{$bar}#{$baz}")', render("\#{$bar}$baz")
+    assert_equal 'unquote("#{$foo}#{$bar}")', render("$foo\#{$bar}")
     assert_renders "\#{$bar}"
   end
 
   def test_interpolation_in_function
     assert_renders 'flabnabbit(#{1 + "foo"})'
-    assert_renders 'flabnabbit($foo #{1 + "foo"}$baz)'
+    assert_equal 'flabnabbit(unquote("#{$foo} #{1 + "foo"}#{$baz}"))',
+                 render('flabnabbit($foo #{1 + "foo"}$baz)')
     assert_renders 'flabnabbit($foo #{1 + "foo"}#{2 + "bar"} $baz)'
   end
 
   def test_interpolation_in_string_function
     assert_renders 'calc(#{1 + "foo"})'
@@ -297,34 +298,34 @@
     assert_renders '3 / #{3 + 4}'
     assert_renders '3 /#{3 + 4}'
     assert_renders '3/ #{3 + 4}'
     assert_renders '3/#{3 + 4}'
 
-    assert_renders '#{1 + 2} * 7'
-    assert_renders '#{1 + 2}* 7'
-    assert_renders '#{1 + 2} *7'
-    assert_renders '#{1 + 2}*7'
+    assert_equal 'unquote("#{1 + 2} * 7")', render('#{1 + 2} * 7')
+    assert_equal 'unquote("#{1 + 2}* 7")', render('#{1 + 2}* 7')
+    assert_equal 'unquote("#{1 + 2} *7")', render('#{1 + 2} *7')
+    assert_equal 'unquote("#{1 + 2}*7")', render('#{1 + 2}*7')
 
     assert_renders '-#{1 + 2}'
-    assert_renders '- #{1 + 2}'
+    assert_equal 'unquote("- #{1 + 2}")', render('- #{1 + 2}')
 
-    assert_renders '5 + #{1 + 2} * #{3 + 4}'
-    assert_renders '5 +#{1 + 2} * #{3 + 4}'
-    assert_renders '5+#{1 + 2} * #{3 + 4}'
-    assert_renders '#{1 + 2} * #{3 + 4} + 5'
-    assert_renders '#{1 + 2} * #{3 + 4}+ 5'
-    assert_renders '#{1 + 2} * #{3 + 4}+5'
+    assert_equal 'unquote("5 + #{1 + 2} * #{3 + 4}")', render('5 + #{1 + 2} * #{3 + 4}')
+    assert_equal 'unquote("5 +#{1 + 2} * #{3 + 4}")', render('5 +#{1 + 2} * #{3 + 4}')
+    assert_equal 'unquote("5+#{1 + 2} * #{3 + 4}")', render('5+#{1 + 2} * #{3 + 4}')
+    assert_equal 'unquote("#{1 + 2} * #{3 + 4} + 5")', render('#{1 + 2} * #{3 + 4} + 5')
+    assert_equal 'unquote("#{1 + 2} * #{3 + 4}+ 5")', render('#{1 + 2} * #{3 + 4}+ 5')
+    assert_equal 'unquote("#{1 + 2} * #{3 + 4}+5")', render('#{1 + 2} * #{3 + 4}+5')
 
-    assert_equal '5 / #{1 + 2} + #{3 + 4}', render('5 / (#{1 + 2} + #{3 + 4})')
-    assert_equal '5 / #{1 + 2} + #{3 + 4}', render('5 /(#{1 + 2} + #{3 + 4})')
-    assert_equal '5 / #{1 + 2} + #{3 + 4}', render('5 /( #{1 + 2} + #{3 + 4} )')
-    assert_equal '#{1 + 2} + #{3 + 4} / 5', render('(#{1 + 2} + #{3 + 4}) / 5')
-    assert_equal '#{1 + 2} + #{3 + 4} / 5', render('(#{1 + 2} + #{3 + 4})/ 5')
-    assert_equal '#{1 + 2} + #{3 + 4} / 5', render('( #{1 + 2} + #{3 + 4} )/ 5')
+    assert_equal '5 / unquote("#{1 + 2} + #{3 + 4}")', render('5 / (#{1 + 2} + #{3 + 4})')
+    assert_equal '5 / unquote("#{1 + 2} + #{3 + 4}")', render('5 /(#{1 + 2} + #{3 + 4})')
+    assert_equal '5 / unquote("#{1 + 2} + #{3 + 4}")', render('5 /( #{1 + 2} + #{3 + 4} )')
+    assert_equal 'unquote("#{1 + 2} + #{3 + 4}") / 5', render('(#{1 + 2} + #{3 + 4}) / 5')
+    assert_equal 'unquote("#{1 + 2} + #{3 + 4}") / 5', render('(#{1 + 2} + #{3 + 4})/ 5')
+    assert_equal 'unquote("#{1 + 2} + #{3 + 4}") / 5', render('( #{1 + 2} + #{3 + 4} )/ 5')
 
-    assert_renders '#{1 + 2} + 2 + 3'
-    assert_renders '#{1 + 2} +2 + 3'
+    assert_equal 'unquote("#{1 + 2} + #{2 + 3}")', render('#{1 + 2} + 2 + 3')
+    assert_equal 'unquote("#{1 + 2} +#{2 + 3}")', render('#{1 + 2} +2 + 3')
   end
 
   def test_string_interpolation
     assert_renders '"foo#{$bar}baz"'
     assert_renders '"foo #{$bar}baz"'
@@ -348,9 +349,9 @@
     assert_equal(script, render(script, options))
   end
 
   def render(script, options = {})
     munge_filename(options)
-    node = Sass::Script.parse(script, 1, 0, options)
+    node = Sass::Script.parse(script, 1, 0, options.merge(:_convert => true))
     node.to_sass
   end
 end