Merge pull request #1424 from sass/dart-sass-fixes

Remove Dart Sass TODOs for function specs
sass · Jul 4, 2019 · d8dc38c · d8dc38c
2 parents 8a96572 + 27efe6f
commit d8dc38c
Show file tree

Hide file tree

Showing 13 changed files with 25 additions and 94 deletions.
diff --git a/spec/core_functions/color/adjust_color/hsl.hrx b/spec/core_functions/color/adjust_color/hsl.hrx
@@ -248,11 +248,6 @@ a {
 
 <===>
 ================================================================================
-<===> alpha_arg_above_max/options.yml
----
-:todo:
-- sass/dart-sass#708
-
 <===> alpha_arg_above_max/input.scss
 // Regression test for sass/dart-sass#708.
 a {b: adjust-color(black, $hue: 12, $saturation: 24%, $lightness: 48%, $alpha: 0.7)}

diff --git a/spec/core_functions/color/alpha.hrx b/spec/core_functions/color/alpha.hrx
@@ -46,13 +46,6 @@ a {
   b: alpha(c=d);
 }
 
-<===>
-================================================================================
-<===> filter/multi_args/options.yml
----
-:todo:
-- sass/dart-sass#701
-
 <===> filter/multi_args/input.scss
 a {b: alpha(c=d, e=f, g=h)}
 
@@ -101,21 +94,14 @@ a {
   b: opacity(10%);
 }
 
-<===>
-================================================================================
-<===> error/too_few_args/options.yml
----
-:todo:
-- sass/dart-sass#700
-
 <===> error/too_few_args/input.scss
 a {b: alpha()}
 
 <===> error/too_few_args/error
 Error: Missing argument $color.
   ,
 1 | a {b: alpha()}
-  |       ^^^^^^
+  |       ^^^^^^^
   '
   input.scss 1:7  root stylesheet
 
@@ -128,11 +114,6 @@ Error: Function alpha is missing argument $color.
 
 <===>
 ================================================================================
-<===> error/too_many_args/options.yml
----
-:todo:
-- sass/dart-sass#700
-
 <===> error/too_many_args/input.scss
 a {b: alpha(red, green)}
 

diff --git a/spec/core_functions/color/invert.hrx b/spec/core_functions/color/invert.hrx
@@ -58,11 +58,6 @@ a {
 
 <===>
 ================================================================================
-<===> weighted/middle/options.yml
----
-:todo:
-- sass/dart-sass#704
-
 <===> weighted/middle/input.scss
 a {b: invert(turquoise, 50%)}
 
@@ -166,13 +161,18 @@ Error: wrong number of arguments (3 for 2) for `invert'
 <===> error/number_with_weight/options.yml
 ---
 :todo:
-- sass/dart-sass#705
 - sass/libsass#2899
 
 <===> error/number_with_weight/input.scss
 a {b: invert(1, 50%)}
 
 <===> error/number_with_weight/error
+Error: Only one argument may be passed to the plain-CSS invert() function.
+  ,
+1 | a {b: invert(1, 50%)}
+  |       ^^^^^^^^^^^^^^
+  '
+  input.scss 1:7  root stylesheet
 
 <===>
 ================================================================================

diff --git a/spec/core_functions/color/saturate.hrx b/spec/core_functions/color/saturate.hrx
@@ -29,7 +29,6 @@ a {
 ---
 :todo:
 - sass/libsass#2897
-- sass/dart-sass#699
 
 <===> one_arg/named/input.scss
 a {b: saturate($amount: 50%)}
@@ -145,7 +144,7 @@ Error: wrong number of arguments (3 for 2) for `saturate'
 a {b: saturate(red)}
 
 <===> error/one_arg/type/error
-Error: $number: red is not a number.
+Error: $amount: red is not a number.
   ,
 1 | a {b: saturate(red)}
   |       ^^^^^^^^^^^^^

diff --git a/spec/core_functions/list/append.hrx b/spec/core_functions/list/append.hrx
@@ -139,7 +139,6 @@ a {
 <===> map/empty/options.yml
 ---
 :todo:
-- sass/dart-sass#737
 - sass/libsass#2924
 
 <===> map/empty/input.scss
@@ -262,11 +261,6 @@ Error: Function append is missing argument $val.
 
 <===>
 ================================================================================
-<===> error/unknown_separator/options.yml
----
-:todo:
-- sass/dart-sass#738
-
 <===> error/unknown_separator/input.scss
 a {b: append(c, d, $separator: e)}
 

diff --git a/spec/core_functions/list/join/empty.hrx b/spec/core_functions/list/join/empty.hrx
@@ -183,7 +183,6 @@ a {
 <===> map/first/undecided/options.yml
 ---
 :todo:
-- sass/dart-sass#737
 - sass/libsass#2924
 
 <===> map/first/undecided/input.scss
@@ -198,15 +197,14 @@ a {
 <===> map/first/undecided/output.css
 a {
   value: ();
-  b: space;
+  separator: space;
 }
 
 <===>
 ================================================================================
 <===> map/first/space/options.yml
 ---
 :todo:
-- sass/dart-sass#737
 - sass/libsass#2924
 
 <===> map/first/space/input.scss
@@ -256,7 +254,6 @@ a {
 <===> map/second/undecided/options.yml
 ---
 :todo:
-- sass/dart-sass#737
 - sass/libsass#2924
 
 <===> map/second/undecided/input.scss

diff --git a/spec/core_functions/list/join/error.hrx b/spec/core_functions/list/join/error.hrx
@@ -109,11 +109,6 @@ Error: wrong number of arguments (6 for 4) for `join'
 
 <===>
 ================================================================================
-<===> unknown_separator/options.yml
----
-:todo:
-- sass/dart-sass#738
-
 <===> unknown_separator/input.scss
 a {b: join(c, d, $separator: e)}
 

diff --git a/spec/core_functions/list/separator.hrx b/spec/core_functions/list/separator.hrx
@@ -21,7 +21,6 @@ a {
 <===> empty/map/options.yml
 ---
 :todo:
-- sass/dart-sass#737
 - sass/libsass#2924
 
 <===> empty/map/input.scss

diff --git a/spec/core_functions/list/zip.hrx b/spec/core_functions/list/zip.hrx
@@ -1,8 +1,3 @@
-<===> no_lists/options.yml
----
-:todo:
-- sass/dart-sass#739
-
 <===> no_lists/input.scss
 @import "core_functions/list/utils";
 

diff --git a/spec/core_functions/map/remove.hrx b/spec/core_functions/map/remove.hrx
@@ -98,11 +98,6 @@ a {
 
 <===>
 ================================================================================
-<===> named/options.yml
----
-:todo:
-- sass/dart-sass#742
-
 <===> named/input.scss
 a {b: inspect(map-remove($map: (c: d), $key: c))}
 
@@ -157,8 +152,15 @@ Error: Function map-remove is missing argument $map.
 <===> error/positional_and_named/options.yml
 ---
 :todo:
-- sass/dart-sass#742
 - sass/libsass#2927
 
 <===> error/positional_and_named/input.scss
 a {b: map-remove((c: d, e: f), c, $key: e)}
+
+<===> error/positional_and_named/error
+Error: Argument $key was passed both by position and by name.
+  ,
+1 | a {b: map-remove((c: d, e: f), c, $key: e)}
+  |       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  '
+  input.scss 1:7  root stylesheet
diff --git a/spec/core_functions/string/insert.hrx b/spec/core_functions/string/insert.hrx
@@ -108,11 +108,6 @@ a {
 
 <===>
 ================================================================================
-<===> index/negative/1/options.yml
----
-:todo:
-- sass/dart-sass#733
-
 <===> index/negative/1/input.scss
 a {b: str-insert("cde", "f", -1)}
 

diff --git a/spec/core_functions/string/slice.hrx b/spec/core_functions/string/slice.hrx
@@ -273,11 +273,6 @@ a {
 
 <===>
 ================================================================================
-<===> double_width_character/options.yml
----
-:todo:
-- sass/dart-sass#732
-
 <===> double_width_character/input.scss
 // Sass treats strings as sequences of Unicode codepoint; it doesn't care if a
 // character is represented as two UTF-16 code units, so inserting a character

diff --git a/spec/libsass-closed-issues/issue_151.hrx b/spec/libsass-closed-issues/issue_151.hrx
@@ -1,3 +1,8 @@
+<===> options.yml
+---
+:todo:
+- sass/libsass#2895
+
 <===> input.scss
 div.colors {
   background: grayscale(red);
@@ -19,32 +24,11 @@ div.numbers {
   -webkit-filter: saturate(0.3);
   -webkit-filter: invert(0.3);
 }
-<===> error-dart-sass
-Error: $number: red is not a number.
+
+<===> error
+Error: $amount: red is not a number.
   ,
 3 |   background: saturate(red);
   |               ^^^^^^^^^^^^^
   '
   input.scss 3:15  root stylesheet
-
-<===> output.css
-div.colors {
-  background: gray;
-  background: saturate(red);
-  background: cyan;
-  background: 1;
-  color: #666666;
-  color: saturate(#369);
-  color: #1f66ad;
-  color: #cc9966;
-  color: 1;
-}
-
-div.numbers {
-  filter: grayscale(30%);
-  filter: saturate(30%);
-  filter: invert(30%);
-  -webkit-filter: grayscale(0.3);
-  -webkit-filter: saturate(0.3);
-  -webkit-filter: invert(0.3);
-}