Merge pull request #1449 from sass/merge-master

Merge master into feature.use

Author: nex3

lib/sass_spec/engine_adapter.rb

@@ -44,7 +44,7 @@ def compile(sass_filename, precision)
     dirname, basename = File.split(sass_filename)
     result = capture3_with_timeout(
       command, "--precision", precision.to_s, "-t", "expanded",
-      "-I", File.absolute_path("spec"), *@args&.split(/\s+/), basename,
+      "-I", File.expand_path("../../../spec", __FILE__), *@args&.split(/\s+/), basename,
       binmode: true, timeout: @timeout, chdir: dirname)
 
     if result[:timeout]
@@ -109,7 +109,7 @@ def describe
   def compile(sass_filename, precision)
     dirname, basename = File.split(sass_filename)
     @stdin.puts "!cd #{File.absolute_path(dirname)}"
-    @stdin.puts("--no-color --no-unicode -I #{File.absolute_path("spec")} " +
+    @stdin.puts("--no-color --no-unicode -I #{File.expand_path("../../../spec", __FILE__)} " +
                 "#{@args} #{basename}")
     [next_chunk(@stdout), next_chunk(@stderr), next_chunk(@stdout).to_i]
   end

spec/core_functions/color/adjust_color/error/bounds.hrx

@@ -2,7 +2,7 @@
 a {b: adjust-color(red, $red: -256)}
 
 <===> red/too_low/error
-Error: Expected -256 to be within -255 and 255.
+Error: $red: Expected -256 to be within -255 and 255.
   ,
 1 | a {b: adjust-color(red, $red: -256)}
   |       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -23,7 +23,7 @@ Error: argument `$red` of `adjust-color($color, $red: false, $green: false, $blu
 a {b: adjust-color(red, $red: 256)}
 
 <===> red/too_high/error
-Error: Expected 256 to be within -255 and 255.
+Error: $red: Expected 256 to be within -255 and 255.
   ,
 1 | a {b: adjust-color(red, $red: 256)}
   |       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -44,7 +44,7 @@ Error: argument `$red` of `adjust-color($color, $red: false, $green: false, $blu
 a {b: adjust-color(green, $green: -256)}
 
 <===> green/too_low/error
-Error: Expected -256 to be within -255 and 255.
+Error: $green: Expected -256 to be within -255 and 255.
   ,
 1 | a {b: adjust-color(green, $green: -256)}
   |       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -65,7 +65,7 @@ Error: argument `$green` of `adjust-color($color, $red: false, $green: false, $b
 a {b: adjust-color(green, $green: 256)}
 
 <===> green/too_high/error
-Error: Expected 256 to be within -255 and 255.
+Error: $green: Expected 256 to be within -255 and 255.
   ,
 1 | a {b: adjust-color(green, $green: 256)}
   |       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -86,7 +86,7 @@ Error: argument `$green` of `adjust-color($color, $red: false, $green: false, $b
 a {b: adjust-color(blue, $blue: -256)}
 
 <===> blue/too_low/error
-Error: Expected -256 to be within -255 and 255.
+Error: $blue: Expected -256 to be within -255 and 255.
   ,
 1 | a {b: adjust-color(blue, $blue: -256)}
   |       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -107,7 +107,7 @@ Error: argument `$blue` of `adjust-color($color, $red: false, $green: false, $bl
 a {b: adjust-color(blue, $blue: 256)}
 
 <===> blue/too_high/error
-Error: Expected 256 to be within -255 and 255.
+Error: $blue: Expected 256 to be within -255 and 255.
   ,
 1 | a {b: adjust-color(blue, $blue: 256)}
   |       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -128,7 +128,7 @@ Error: argument `$blue` of `adjust-color($color, $red: false, $green: false, $bl
 a {b: adjust-color(red, $saturation: -100.001)}
 
 <===> saturation/too_low/error
-Error: Expected -100.001 to be within -100 and 100.
+Error: $saturation: Expected -100.001 to be within -100 and 100.
   ,
 1 | a {b: adjust-color(red, $saturation: -100.001)}
   |       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -149,7 +149,7 @@ Error: argument `$saturation` of `adjust-color($color, $red: false, $green: fals
 a {b: adjust-color(red, $saturation: 100.001)}
 
 <===> saturation/too_high/error
-Error: Expected 100.001 to be within -100 and 100.
+Error: $saturation: Expected 100.001 to be within -100 and 100.
   ,
 1 | a {b: adjust-color(red, $saturation: 100.001)}
   |       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -170,7 +170,7 @@ Error: argument `$saturation` of `adjust-color($color, $red: false, $green: fals
 a {b: adjust-color(red, $lightness: -100.001)}
 
 <===> lightness/too_low/error
-Error: Expected -100.001 to be within -100 and 100.
+Error: $lightness: Expected -100.001 to be within -100 and 100.
   ,
 1 | a {b: adjust-color(red, $lightness: -100.001)}
   |       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -191,7 +191,7 @@ Error: argument `$lightness` of `adjust-color($color, $red: false, $green: false
 a {b: adjust-color(red, $lightness: 100.001)}
 
 <===> lightness/too_high/error
-Error: Expected 100.001 to be within -100 and 100.
+Error: $lightness: Expected 100.001 to be within -100 and 100.
   ,
 1 | a {b: adjust-color(red, $lightness: 100.001)}
   |       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -212,7 +212,7 @@ Error: argument `$lightness` of `adjust-color($color, $red: false, $green: false
 a {b: adjust-color(red, $alpha: -1.001)}
 
 <===> alpha/too_low/error
-Error: Expected -1.001 to be within -1 and 1.
+Error: $alpha: Expected -1.001 to be within -1 and 1.
   ,
 1 | a {b: adjust-color(red, $alpha: -1.001)}
   |       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -233,7 +233,7 @@ Error: argument `$alpha` of `adjust-color($color, $red: false, $green: false, $b
 a {b: adjust-color(red, $alpha: 1.001)}
 
 <===> alpha/too_high/error
-Error: Expected 1.001 to be within -1 and 1.
+Error: $alpha: Expected 1.001 to be within -1 and 1.
   ,
 1 | a {b: adjust-color(red, $alpha: 1.001)}
   |       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

spec/core_functions/color/change_color/error/bounds.hrx

@@ -2,7 +2,7 @@
 a {b: change-color(red, $red: -1)}
 
 <===> red/too_low/error
-Error: Expected -1 to be within 0 and 255.
+Error: $red: Expected -1 to be within 0 and 255.
   ,
 1 | a {b: change-color(red, $red: -1)}
   |       ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -23,7 +23,7 @@ Error: argument `$red` of `change-color($color, $red: false, $green: false, $blu
 a {b: change-color(red, $red: 256)}
 
 <===> red/too_high/error
-Error: Expected 256 to be within 0 and 255.
+Error: $red: Expected 256 to be within 0 and 255.
   ,
 1 | a {b: change-color(red, $red: 256)}
   |       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -44,7 +44,7 @@ Error: argument `$red` of `change-color($color, $red: false, $green: false, $blu
 a {b: change-color(green, $green: -1)}
 
 <===> green/too_low/error
-Error: Expected -1 to be within 0 and 255.
+Error: $green: Expected -1 to be within 0 and 255.
   ,
 1 | a {b: change-color(green, $green: -1)}
   |       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -65,7 +65,7 @@ Error: argument `$green` of `change-color($color, $red: false, $green: false, $b
 a {b: change-color(green, $green: 256)}
 
 <===> green/too_high/error
-Error: Expected 256 to be within 0 and 255.
+Error: $green: Expected 256 to be within 0 and 255.
   ,
 1 | a {b: change-color(green, $green: 256)}
   |       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -86,7 +86,7 @@ Error: argument `$green` of `change-color($color, $red: false, $green: false, $b
 a {b: change-color(blue, $blue: -1)}
 
 <===> blue/too_low/error
-Error: Expected -1 to be within 0 and 255.
+Error: $blue: Expected -1 to be within 0 and 255.
   ,
 1 | a {b: change-color(blue, $blue: -1)}
   |       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -107,7 +107,7 @@ Error: argument `$blue` of `change-color($color, $red: false, $green: false, $bl
 a {b: change-color(blue, $blue: 256)}
 
 <===> blue/too_high/error
-Error: Expected 256 to be within 0 and 255.
+Error: $blue: Expected 256 to be within 0 and 255.
   ,
 1 | a {b: change-color(blue, $blue: 256)}
   |       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -128,7 +128,7 @@ Error: argument `$blue` of `change-color($color, $red: false, $green: false, $bl
 a {b: change-color(red, $saturation: -0.001)}
 
 <===> saturation/too_low/error
-Error: Expected -0.001 to be within 0 and 100.
+Error: $saturation: Expected -0.001 to be within 0 and 100.
   ,
 1 | a {b: change-color(red, $saturation: -0.001)}
   |       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -149,7 +149,7 @@ Error: argument `$saturation` of `change-color($color, $red: false, $green: fals
 a {b: change-color(red, $saturation: 100.001)}
 
 <===> saturation/too_high/error
-Error: Expected 100.001 to be within 0 and 100.
+Error: $saturation: Expected 100.001 to be within 0 and 100.
   ,
 1 | a {b: change-color(red, $saturation: 100.001)}
   |       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -170,7 +170,7 @@ Error: argument `$saturation` of `change-color($color, $red: false, $green: fals
 a {b: change-color(red, $lightness: -0.001)}
 
 <===> lightness/too_low/error
-Error: Expected -0.001 to be within 0 and 100.
+Error: $lightness: Expected -0.001 to be within 0 and 100.
   ,
 1 | a {b: change-color(red, $lightness: -0.001)}
   |       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -191,7 +191,7 @@ Error: argument `$lightness` of `change-color($color, $red: false, $green: false
 a {b: change-color(red, $lightness: 100.001)}
 
 <===> lightness/too_high/error
-Error: Expected 100.001 to be within 0 and 100.
+Error: $lightness: Expected 100.001 to be within 0 and 100.
   ,
 1 | a {b: change-color(red, $lightness: 100.001)}
   |       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -212,7 +212,7 @@ Error: argument `$lightness` of `change-color($color, $red: false, $green: false
 a {b: change-color(red, $alpha: -0.001)}
 
 <===> alpha/too_low/error
-Error: Expected -0.001 to be within 0 and 1.
+Error: $alpha: Expected -0.001 to be within 0 and 1.
   ,
 1 | a {b: change-color(red, $alpha: -0.001)}
   |       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -233,7 +233,7 @@ Error: argument `$alpha` of `change-color($color, $red: false, $green: false, $b
 a {b: change-color(red, $alpha: 1.001)}
 
 <===> alpha/too_high/error
-Error: Expected 1.001 to be within 0 and 1.
+Error: $alpha: Expected 1.001 to be within 0 and 1.
   ,
 1 | a {b: change-color(red, $alpha: 1.001)}
   |       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

spec/core_functions/color/darken.hrx

@@ -154,7 +154,7 @@ Error: argument `$amount` of `darken($color, $amount)` must be a number
 a {b: darken(red, -0.001)}
 
 <===> error/bounds/too_low/error
-Error: Expected -0.001 to be within 0 and 100.
+Error: $amount: Expected -0.001 to be within 0 and 100.
   ,
 1 | a {b: darken(red, -0.001)}
   |       ^^^^^^^^^^^^^^^^^^^
@@ -175,7 +175,7 @@ Error: argument `$amount` of `darken($color, $amount)` must be between -0 and 10
 a {b: darken(red, 100.001)}
 
 <===> error/bounds/too_high/error
-Error: Expected 100.001 to be within 0 and 100.
+Error: $amount: Expected 100.001 to be within 0 and 100.
   ,
 1 | a {b: darken(red, 100.001)}
   |       ^^^^^^^^^^^^^^^^^^^^

spec/core_functions/color/desaturate.hrx

@@ -164,7 +164,7 @@ Error: argument `$amount` of `desaturate($color, $amount)` must be a number
 a {b: desaturate(plum, -0.001)}
 
 <===> error/bounds/too_low/error
-Error: Expected -0.001 to be within 0 and 100.
+Error: $amount: Expected -0.001 to be within 0 and 100.
   ,
 1 | a {b: desaturate(plum, -0.001)}
   |       ^^^^^^^^^^^^^^^^^^^^^^^^
@@ -185,7 +185,7 @@ Error: argument `$amount` of `desaturate($color, $amount)` must be between -0 an
 a {b: desaturate(plum, 100.001)}
 
 <===> error/bounds/too_high/error
-Error: Expected 100.001 to be within 0 and 100.
+Error: $amount: Expected 100.001 to be within 0 and 100.
   ,
 1 | a {b: desaturate(plum, 100.001)}
   |       ^^^^^^^^^^^^^^^^^^^^^^^^^

spec/core_functions/color/fade_in.hrx

@@ -144,7 +144,7 @@ Error: argument `$amount` of `fade-in($color, $amount)` must be a number
 a {b: fade-in(red, -0.001)}
 
 <===> error/bounds/too_low/error
-Error: Expected -0.001 to be within 0 and 1.
+Error: $amount: Expected -0.001 to be within 0 and 1.
   ,
 1 | a {b: fade-in(red, -0.001)}
   |       ^^^^^^^^^^^^^^^^^^^^
@@ -165,7 +165,7 @@ Error: argument `$amount` of `fade-in($color, $amount)` must be between -0 and 1
 a {b: fade-in(red, 1.001)}
 
 <===> error/bounds/too_high/error
-Error: Expected 1.001 to be within 0 and 1.
+Error: $amount: Expected 1.001 to be within 0 and 1.
   ,
 1 | a {b: fade-in(red, 1.001)}
   |       ^^^^^^^^^^^^^^^^^^^

spec/core_functions/color/fade_out.hrx

@@ -144,7 +144,7 @@ Error: argument `$amount` of `fade-out($color, $amount)` must be a number
 a {b: fade-out(red, -0.001)}
 
 <===> error/bounds/too_low/error
-Error: Expected -0.001 to be within 0 and 1.
+Error: $amount: Expected -0.001 to be within 0 and 1.
   ,
 1 | a {b: fade-out(red, -0.001)}
   |       ^^^^^^^^^^^^^^^^^^^^^
@@ -165,7 +165,7 @@ Error: argument `$amount` of `fade-out($color, $amount)` must be between -0 and
 a {b: fade-out(red, 1.001)}
 
 <===> error/bounds/too_high/error
-Error: Expected 1.001 to be within 0 and 1.
+Error: $amount: Expected 1.001 to be within 0 and 1.
   ,
 1 | a {b: fade-out(red, 1.001)}
   |       ^^^^^^^^^^^^^^^^^^^^

spec/core_functions/color/invert.hrx

@@ -222,7 +222,7 @@ Error: argument `$weight` of `invert($color, $weight: 100%)` must be a number
 a {b: invert(red, -0.001)}
 
 <===> error/bounds/too_low/error
-Error: Expected -0.001 to be within 0 and 100.
+Error: $weight: Expected -0.001 to be within 0 and 100.
   ,
 1 | a {b: invert(red, -0.001)}
   |       ^^^^^^^^^^^^^^^^^^^
@@ -243,7 +243,7 @@ Error: argument `$weight` of `invert($color, $weight: 100%)` must be between -0
 a {b: invert(red, 100.001)}
 
 <===> error/bounds/too_high/error
-Error: Expected 100.001 to be within 0 and 100.
+Error: $weight: Expected 100.001 to be within 0 and 100.
   ,
 1 | a {b: invert(red, 100.001)}
   |       ^^^^^^^^^^^^^^^^^^^^

spec/core_functions/color/lighten.hrx

@@ -154,7 +154,7 @@ Error: argument `$amount` of `lighten($color, $amount)` must be a number
 a {b: lighten(red, -0.001)}
 
 <===> error/bounds/too_low/error
-Error: Expected -0.001 to be within 0 and 100.
+Error: $amount: Expected -0.001 to be within 0 and 100.
   ,
 1 | a {b: lighten(red, -0.001)}
   |       ^^^^^^^^^^^^^^^^^^^^
@@ -175,7 +175,7 @@ Error: argument `$amount` of `lighten($color, $amount)` must be between -0 and 1
 a {b: lighten(red, 100.001)}
 
 <===> error/bounds/too_high/error
-Error: Expected 100.001 to be within 0 and 100.
+Error: $amount: Expected 100.001 to be within 0 and 100.
   ,
 1 | a {b: lighten(red, 100.001)}
   |       ^^^^^^^^^^^^^^^^^^^^^

spec/core_functions/color/mix.hrx

@@ -326,7 +326,7 @@ Error: argument `$weight` of `mix($color1, $color2, $weight: 50%)` must be a num
 a {b: mix(red, blue, -0.001)}
 
 <===> error/bounds/too_low/error
-Error: Expected -0.001 to be within 0 and 100.
+Error: $weight: Expected -0.001 to be within 0 and 100.
   ,
 1 | a {b: mix(red, blue, -0.001)}
   |       ^^^^^^^^^^^^^^^^^^^^^^
@@ -347,7 +347,7 @@ Error: argument `$weight` of `mix($color1, $color2, $weight: 50%)` must be betwe
 a {b: mix(red, blue, 100.001)}
 
 <===> error/bounds/too_high/error
-Error: Expected 100.001 to be within 0 and 100.
+Error: $weight: Expected 100.001 to be within 0 and 100.
   ,
 1 | a {b: mix(red, blue, 100.001)}
   |       ^^^^^^^^^^^^^^^^^^^^^^^