From e83077586664c2c92722e0a321cf3d5414e4122a Mon Sep 17 00:00:00 2001 From: Marcel Greter Date: Sat, 14 Nov 2015 23:18:11 +0100 Subject: [PATCH] Add more spec tests for libsass issue 1169 --- .../issue_1169/error/color/error | 3 +++ .../issue_1169/error/color/expected_output.css | 0 .../issue_1169/error/color/input.scss | 8 ++++++++ .../issue_1169/error/color/status | 1 + .../issue_1169/error/functioncall/error | 3 +++ .../error/functioncall/expected_output.css | 0 .../issue_1169/error/functioncall/input.scss | 12 ++++++++++++ .../issue_1169/error/functioncall/status | 1 + .../issue_1169/error/interpolate/error | 3 +++ .../error/interpolate/expected_output.css | 0 .../issue_1169/error/interpolate/input.scss | 8 ++++++++ .../issue_1169/error/interpolate/status | 1 + .../issue_1169/error/simple/expected.compact.css | 1 + .../error/simple/expected.compressed.css | 1 + .../issue_1169/error/simple/expected.expanded.css | 3 +++ .../issue_1169/error/simple/expected_output.css | 2 ++ .../issue_1169/error/simple/input.scss | 8 ++++++++ .../issue_1169/functioncall/expected.compact.css | 1 + .../functioncall/expected.compressed.css | 1 + .../issue_1169/functioncall/expected.expanded.css | 3 +++ .../issue_1169/functioncall/expected_output.css | 2 ++ .../issue_1169/functioncall/input.scss | 15 +++++++++++++++ .../{ => interpolated}/expected.compact.css | 0 .../{ => interpolated}/expected.compressed.css | 0 .../{ => interpolated}/expected.expanded.css | 0 .../{ => interpolated}/expected_output.css | 0 .../issue_1169/{ => interpolated}/input.scss | 0 .../issue_1169/simple/expected.compact.css | 1 + .../issue_1169/simple/expected.compressed.css | 1 + .../issue_1169/simple/expected.expanded.css | 4 ++++ .../issue_1169/simple/expected_output.css | 3 +++ .../issue_1169/simple/input.scss | 14 ++++++++++++++ 32 files changed, 100 insertions(+) create mode 100644 spec/libsass-closed-issues/issue_1169/error/color/error create mode 100644 spec/libsass-closed-issues/issue_1169/error/color/expected_output.css create mode 100644 spec/libsass-closed-issues/issue_1169/error/color/input.scss create mode 100644 spec/libsass-closed-issues/issue_1169/error/color/status create mode 100644 spec/libsass-closed-issues/issue_1169/error/functioncall/error create mode 100644 spec/libsass-closed-issues/issue_1169/error/functioncall/expected_output.css create mode 100644 spec/libsass-closed-issues/issue_1169/error/functioncall/input.scss create mode 100644 spec/libsass-closed-issues/issue_1169/error/functioncall/status create mode 100644 spec/libsass-closed-issues/issue_1169/error/interpolate/error create mode 100644 spec/libsass-closed-issues/issue_1169/error/interpolate/expected_output.css create mode 100644 spec/libsass-closed-issues/issue_1169/error/interpolate/input.scss create mode 100644 spec/libsass-closed-issues/issue_1169/error/interpolate/status create mode 100644 spec/libsass-closed-issues/issue_1169/error/simple/expected.compact.css create mode 100644 spec/libsass-closed-issues/issue_1169/error/simple/expected.compressed.css create mode 100644 spec/libsass-closed-issues/issue_1169/error/simple/expected.expanded.css create mode 100644 spec/libsass-closed-issues/issue_1169/error/simple/expected_output.css create mode 100644 spec/libsass-closed-issues/issue_1169/error/simple/input.scss create mode 100644 spec/libsass-closed-issues/issue_1169/functioncall/expected.compact.css create mode 100644 spec/libsass-closed-issues/issue_1169/functioncall/expected.compressed.css create mode 100644 spec/libsass-closed-issues/issue_1169/functioncall/expected.expanded.css create mode 100644 spec/libsass-closed-issues/issue_1169/functioncall/expected_output.css create mode 100644 spec/libsass-closed-issues/issue_1169/functioncall/input.scss rename spec/libsass-closed-issues/issue_1169/{ => interpolated}/expected.compact.css (100%) rename spec/libsass-closed-issues/issue_1169/{ => interpolated}/expected.compressed.css (100%) rename spec/libsass-closed-issues/issue_1169/{ => interpolated}/expected.expanded.css (100%) rename spec/libsass-closed-issues/issue_1169/{ => interpolated}/expected_output.css (100%) rename spec/libsass-closed-issues/issue_1169/{ => interpolated}/input.scss (100%) create mode 100644 spec/libsass-closed-issues/issue_1169/simple/expected.compact.css create mode 100644 spec/libsass-closed-issues/issue_1169/simple/expected.compressed.css create mode 100644 spec/libsass-closed-issues/issue_1169/simple/expected.expanded.css create mode 100644 spec/libsass-closed-issues/issue_1169/simple/expected_output.css create mode 100644 spec/libsass-closed-issues/issue_1169/simple/input.scss diff --git a/spec/libsass-closed-issues/issue_1169/error/color/error b/spec/libsass-closed-issues/issue_1169/error/color/error new file mode 100644 index 0000000000..26cd4470cb --- /dev/null +++ b/spec/libsass-closed-issues/issue_1169/error/color/error @@ -0,0 +1,3 @@ +Error: Duplicate key #ff0000 in map (red: "foo", red: "bar"). + on line 1 of /sass/sass-spec/spec/libsass-issues/issue_1169/error/color/input.scss + Use --trace for backtrace. diff --git a/spec/libsass-closed-issues/issue_1169/error/color/expected_output.css b/spec/libsass-closed-issues/issue_1169/error/color/expected_output.css new file mode 100644 index 0000000000..e69de29bb2 diff --git a/spec/libsass-closed-issues/issue_1169/error/color/input.scss b/spec/libsass-closed-issues/issue_1169/error/color/input.scss new file mode 100644 index 0000000000..841360527c --- /dev/null +++ b/spec/libsass-closed-issues/issue_1169/error/color/input.scss @@ -0,0 +1,8 @@ +$map: ( + red: 'foo', + red: 'bar', +); + +.foo { + content: inspect($map); +} \ No newline at end of file diff --git a/spec/libsass-closed-issues/issue_1169/error/color/status b/spec/libsass-closed-issues/issue_1169/error/color/status new file mode 100644 index 0000000000..b44fe09a7a --- /dev/null +++ b/spec/libsass-closed-issues/issue_1169/error/color/status @@ -0,0 +1 @@ +65 \ No newline at end of file diff --git a/spec/libsass-closed-issues/issue_1169/error/functioncall/error b/spec/libsass-closed-issues/issue_1169/error/functioncall/error new file mode 100644 index 0000000000..2ce7b2c1c5 --- /dev/null +++ b/spec/libsass-closed-issues/issue_1169/error/functioncall/error @@ -0,0 +1,3 @@ +Error: Duplicate key "key" in map (fncall(1 + 2): "foo", fncall(1 + 2): "bar"). + on line 5 of /sass/sass-spec/spec/libsass-issues/issue_1169/error/functioncall/input.scss + Use --trace for backtrace. diff --git a/spec/libsass-closed-issues/issue_1169/error/functioncall/expected_output.css b/spec/libsass-closed-issues/issue_1169/error/functioncall/expected_output.css new file mode 100644 index 0000000000..e69de29bb2 diff --git a/spec/libsass-closed-issues/issue_1169/error/functioncall/input.scss b/spec/libsass-closed-issues/issue_1169/error/functioncall/input.scss new file mode 100644 index 0000000000..4e240ce01f --- /dev/null +++ b/spec/libsass-closed-issues/issue_1169/error/functioncall/input.scss @@ -0,0 +1,12 @@ +@function fncall($void) { + @return "key"; +} + +$map: ( + fncall(1+2): 'foo', + fncall(1+2): 'bar', +); + +.foo { + content: inspect($map); +} \ No newline at end of file diff --git a/spec/libsass-closed-issues/issue_1169/error/functioncall/status b/spec/libsass-closed-issues/issue_1169/error/functioncall/status new file mode 100644 index 0000000000..b44fe09a7a --- /dev/null +++ b/spec/libsass-closed-issues/issue_1169/error/functioncall/status @@ -0,0 +1 @@ +65 \ No newline at end of file diff --git a/spec/libsass-closed-issues/issue_1169/error/interpolate/error b/spec/libsass-closed-issues/issue_1169/error/interpolate/error new file mode 100644 index 0000000000..84f4640fe6 --- /dev/null +++ b/spec/libsass-closed-issues/issue_1169/error/interpolate/error @@ -0,0 +1,3 @@ +Error: Duplicate key "red" in map ("red": "bar", #{re}#{"d"}: "baz"). + on line 1 of /sass/sass-spec/spec/libsass-issues/issue_1169/error/interpolate/input.scss + Use --trace for backtrace. diff --git a/spec/libsass-closed-issues/issue_1169/error/interpolate/expected_output.css b/spec/libsass-closed-issues/issue_1169/error/interpolate/expected_output.css new file mode 100644 index 0000000000..e69de29bb2 diff --git a/spec/libsass-closed-issues/issue_1169/error/interpolate/input.scss b/spec/libsass-closed-issues/issue_1169/error/interpolate/input.scss new file mode 100644 index 0000000000..3d78b2511d --- /dev/null +++ b/spec/libsass-closed-issues/issue_1169/error/interpolate/input.scss @@ -0,0 +1,8 @@ +$map: ( + 'red': 'bar', + #{re}#{'d'}: 'baz', +); + +.foo { + content: inspect($map); +} \ No newline at end of file diff --git a/spec/libsass-closed-issues/issue_1169/error/interpolate/status b/spec/libsass-closed-issues/issue_1169/error/interpolate/status new file mode 100644 index 0000000000..b44fe09a7a --- /dev/null +++ b/spec/libsass-closed-issues/issue_1169/error/interpolate/status @@ -0,0 +1 @@ +65 \ No newline at end of file diff --git a/spec/libsass-closed-issues/issue_1169/error/simple/expected.compact.css b/spec/libsass-closed-issues/issue_1169/error/simple/expected.compact.css new file mode 100644 index 0000000000..d1a30fd5a9 --- /dev/null +++ b/spec/libsass-closed-issues/issue_1169/error/simple/expected.compact.css @@ -0,0 +1 @@ +.foo { content: (red: "bar", red: "baz"); } diff --git a/spec/libsass-closed-issues/issue_1169/error/simple/expected.compressed.css b/spec/libsass-closed-issues/issue_1169/error/simple/expected.compressed.css new file mode 100644 index 0000000000..c462ce8920 --- /dev/null +++ b/spec/libsass-closed-issues/issue_1169/error/simple/expected.compressed.css @@ -0,0 +1 @@ +.foo{content:(red: "bar", red: "baz")} diff --git a/spec/libsass-closed-issues/issue_1169/error/simple/expected.expanded.css b/spec/libsass-closed-issues/issue_1169/error/simple/expected.expanded.css new file mode 100644 index 0000000000..062173ebb2 --- /dev/null +++ b/spec/libsass-closed-issues/issue_1169/error/simple/expected.expanded.css @@ -0,0 +1,3 @@ +.foo { + content: (red: "bar", red: "baz"); +} diff --git a/spec/libsass-closed-issues/issue_1169/error/simple/expected_output.css b/spec/libsass-closed-issues/issue_1169/error/simple/expected_output.css new file mode 100644 index 0000000000..494bc1f1bf --- /dev/null +++ b/spec/libsass-closed-issues/issue_1169/error/simple/expected_output.css @@ -0,0 +1,2 @@ +.foo { + content: (red: "bar", red: "baz"); } diff --git a/spec/libsass-closed-issues/issue_1169/error/simple/input.scss b/spec/libsass-closed-issues/issue_1169/error/simple/input.scss new file mode 100644 index 0000000000..c453f30989 --- /dev/null +++ b/spec/libsass-closed-issues/issue_1169/error/simple/input.scss @@ -0,0 +1,8 @@ +$map: ( + red: 'bar', + #{red}: 'baz', +); + +.foo { + content: inspect($map); +} \ No newline at end of file diff --git a/spec/libsass-closed-issues/issue_1169/functioncall/expected.compact.css b/spec/libsass-closed-issues/issue_1169/functioncall/expected.compact.css new file mode 100644 index 0000000000..55f82e701a --- /dev/null +++ b/spec/libsass-closed-issues/issue_1169/functioncall/expected.compact.css @@ -0,0 +1 @@ +.foo { content: (1: "bar", 2: "foo"); } diff --git a/spec/libsass-closed-issues/issue_1169/functioncall/expected.compressed.css b/spec/libsass-closed-issues/issue_1169/functioncall/expected.compressed.css new file mode 100644 index 0000000000..710df105bf --- /dev/null +++ b/spec/libsass-closed-issues/issue_1169/functioncall/expected.compressed.css @@ -0,0 +1 @@ +.foo{content:(1: "bar", 2: "foo")} diff --git a/spec/libsass-closed-issues/issue_1169/functioncall/expected.expanded.css b/spec/libsass-closed-issues/issue_1169/functioncall/expected.expanded.css new file mode 100644 index 0000000000..c00133967f --- /dev/null +++ b/spec/libsass-closed-issues/issue_1169/functioncall/expected.expanded.css @@ -0,0 +1,3 @@ +.foo { + content: (1: "bar", 2: "foo"); +} diff --git a/spec/libsass-closed-issues/issue_1169/functioncall/expected_output.css b/spec/libsass-closed-issues/issue_1169/functioncall/expected_output.css new file mode 100644 index 0000000000..0ef1a12c00 --- /dev/null +++ b/spec/libsass-closed-issues/issue_1169/functioncall/expected_output.css @@ -0,0 +1,2 @@ +.foo { + content: (1: "bar", 2: "foo"); } diff --git a/spec/libsass-closed-issues/issue_1169/functioncall/input.scss b/spec/libsass-closed-issues/issue_1169/functioncall/input.scss new file mode 100644 index 0000000000..3e69d2c91e --- /dev/null +++ b/spec/libsass-closed-issues/issue_1169/functioncall/input.scss @@ -0,0 +1,15 @@ +$count: 0; + +@function counter() { + $count: $count + 1 !global; + @return $count; +} + +$map: ( + counter(): 'bar', + counter(): 'foo', +); + +.foo { + content: inspect($map); +} \ No newline at end of file diff --git a/spec/libsass-closed-issues/issue_1169/expected.compact.css b/spec/libsass-closed-issues/issue_1169/interpolated/expected.compact.css similarity index 100% rename from spec/libsass-closed-issues/issue_1169/expected.compact.css rename to spec/libsass-closed-issues/issue_1169/interpolated/expected.compact.css diff --git a/spec/libsass-closed-issues/issue_1169/expected.compressed.css b/spec/libsass-closed-issues/issue_1169/interpolated/expected.compressed.css similarity index 100% rename from spec/libsass-closed-issues/issue_1169/expected.compressed.css rename to spec/libsass-closed-issues/issue_1169/interpolated/expected.compressed.css diff --git a/spec/libsass-closed-issues/issue_1169/expected.expanded.css b/spec/libsass-closed-issues/issue_1169/interpolated/expected.expanded.css similarity index 100% rename from spec/libsass-closed-issues/issue_1169/expected.expanded.css rename to spec/libsass-closed-issues/issue_1169/interpolated/expected.expanded.css diff --git a/spec/libsass-closed-issues/issue_1169/expected_output.css b/spec/libsass-closed-issues/issue_1169/interpolated/expected_output.css similarity index 100% rename from spec/libsass-closed-issues/issue_1169/expected_output.css rename to spec/libsass-closed-issues/issue_1169/interpolated/expected_output.css diff --git a/spec/libsass-closed-issues/issue_1169/input.scss b/spec/libsass-closed-issues/issue_1169/interpolated/input.scss similarity index 100% rename from spec/libsass-closed-issues/issue_1169/input.scss rename to spec/libsass-closed-issues/issue_1169/interpolated/input.scss diff --git a/spec/libsass-closed-issues/issue_1169/simple/expected.compact.css b/spec/libsass-closed-issues/issue_1169/simple/expected.compact.css new file mode 100644 index 0000000000..2cd8031fb2 --- /dev/null +++ b/spec/libsass-closed-issues/issue_1169/simple/expected.compact.css @@ -0,0 +1 @@ +.foo { content: (red: "bar", "red": "foo"); content: (red: "bar", "red": red); } diff --git a/spec/libsass-closed-issues/issue_1169/simple/expected.compressed.css b/spec/libsass-closed-issues/issue_1169/simple/expected.compressed.css new file mode 100644 index 0000000000..3aa2a32dd8 --- /dev/null +++ b/spec/libsass-closed-issues/issue_1169/simple/expected.compressed.css @@ -0,0 +1 @@ +.foo{content:(red: "bar", "red": "foo");content:(red: "bar", "red": red)} diff --git a/spec/libsass-closed-issues/issue_1169/simple/expected.expanded.css b/spec/libsass-closed-issues/issue_1169/simple/expected.expanded.css new file mode 100644 index 0000000000..0e20311983 --- /dev/null +++ b/spec/libsass-closed-issues/issue_1169/simple/expected.expanded.css @@ -0,0 +1,4 @@ +.foo { + content: (red: "bar", "red": "foo"); + content: (red: "bar", "red": red); +} diff --git a/spec/libsass-closed-issues/issue_1169/simple/expected_output.css b/spec/libsass-closed-issues/issue_1169/simple/expected_output.css new file mode 100644 index 0000000000..1864f272a9 --- /dev/null +++ b/spec/libsass-closed-issues/issue_1169/simple/expected_output.css @@ -0,0 +1,3 @@ +.foo { + content: (red: "bar", "red": "foo"); + content: (red: "bar", "red": red); } diff --git a/spec/libsass-closed-issues/issue_1169/simple/input.scss b/spec/libsass-closed-issues/issue_1169/simple/input.scss new file mode 100644 index 0000000000..124b6af409 --- /dev/null +++ b/spec/libsass-closed-issues/issue_1169/simple/input.scss @@ -0,0 +1,14 @@ +$map1: ( + red: 'bar', + 'red': 'foo', +); + +$map2: ( + red: 'bar', + 'red': #{red}, +); + +.foo { + content: inspect($map1); + content: inspect($map2); +} \ No newline at end of file