Skip to content

Commit daff4d6

Browse files
committed
Merge pull request #713 from mgreter/todo-test/error-with-unicode
Add spec test for error reporting with unicode involved
2 parents bf60606 + d01d003 commit daff4d6

File tree

17 files changed

+22
-2
lines changed

17 files changed

+22
-2
lines changed

lib/sass_spec/test_case.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ def output
9999
end
100100

101101
def expected
102-
output = File.read(@expected_path, :binmode => true)
102+
output = File.read(@expected_path, :binmode => true, :encoding => "ASCII-8BIT")
103103
# we seem to get CP850 otherwise
104104
# this provokes equal test to fail
105105
output.force_encoding('ASCII-8BIT')
@@ -111,7 +111,7 @@ def expected
111111
end
112112

113113
def expected_error
114-
@expected_error = _clean_error(File.read(@error_path, :binmode => true))
114+
@expected_error = _clean_error(File.read(@error_path, :binmode => true, :encoding => "ASCII-8BIT"))
115115
end
116116

117117
def expected_status
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Error: Invalid UTF-8 character "\xF6"
2+
on line 1 of /sass/spec/errors/unicode/invalid/after/input.scss
3+
Use --trace for backtrace.

spec/libsass-todo-tests/errors/unicode/invalid/after/expected_output.css

Whitespace-only changes.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
foo{;��������
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
65
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Error: Invalid UTF-8 character "\xF6"
2+
on line 1 of /sass/spec/errors/unicode/invalid/before/input.scss
3+
Use --trace for backtrace.

spec/libsass-todo-tests/errors/unicode/invalid/before/expected_output.css

Whitespace-only changes.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
��������{a:c
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
65
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Error: Invalid CSS after "foo{;öüäöüäöü": expected "{", was ""
2+
on line 1 of /sass/spec/errors/unicode/report/after/input.scss
3+
Use --trace for backtrace.

0 commit comments

Comments
 (0)