Skip to content

Commit 7009b4b

Browse files
committed
print_error shouldn't return trailing new line
Replicates graphql/graphql-js@3ddf148
1 parent 9919035 commit 7009b4b

File tree

5 files changed

+21
-25
lines changed

5 files changed

+21
-25
lines changed

graphql/error/print_error.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def print_error(error: "GraphQLError") -> str:
3131
for location in error.locations:
3232
print_location(highlight_source_at_location(source, location))
3333
if printed_locations:
34-
return "\n\n".join([error.message] + printed_locations) + "\n"
34+
return "\n\n".join([error.message] + printed_locations)
3535
return error.message
3636

3737

tests/error/test_print_error.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def prints_line_numbers_with_correct_padding():
2525
Source("*", "Test", SourceLocation(9, 1)),
2626
[0],
2727
)
28-
assert print_error(single_digit) == dedent(
28+
assert print_error(single_digit) + "\n" == dedent(
2929
"""
3030
Single digit line number with no padding
3131
@@ -42,7 +42,7 @@ def prints_line_numbers_with_correct_padding():
4242
[0],
4343
)
4444

45-
assert print_error(double_digit) == dedent(
45+
assert print_error(double_digit) + "\n" == dedent(
4646
"""
4747
Left padded first line number
4848
@@ -92,7 +92,7 @@ def prints_an_error_with_nodes_from_different_sources():
9292
)
9393

9494
printed_error = print_error(error)
95-
assert printed_error == dedent(
95+
assert printed_error + "\n" == dedent(
9696
"""
9797
Example error with two nodes
9898

tests/language/test_lexer.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def errors_respect_whitespace():
6161
with raises(GraphQLSyntaxError) as exc_info:
6262
lex_one("\n\n ?\n\n\n")
6363

64-
assert str(exc_info.value) == dedent(
64+
assert str(exc_info.value) + "\n" == dedent(
6565
"""
6666
Syntax Error: Cannot parse the unexpected character '?'.
6767
@@ -78,7 +78,7 @@ def updates_line_numbers_in_error_for_file_context():
7878
source = Source(s, "foo.js", SourceLocation(11, 12))
7979
with raises(GraphQLSyntaxError) as exc_info:
8080
Lexer(source).advance()
81-
assert str(exc_info.value) == dedent(
81+
assert str(exc_info.value) + "\n" == dedent(
8282
"""
8383
Syntax Error: Cannot parse the unexpected character '?'.
8484
@@ -94,7 +94,7 @@ def updates_column_numbers_in_error_for_file_context():
9494
source = Source("?", "foo.js", SourceLocation(1, 5))
9595
with raises(GraphQLSyntaxError) as exc_info:
9696
Lexer(source).advance()
97-
assert str(exc_info.value) == dedent(
97+
assert str(exc_info.value) + "\n" == dedent(
9898
"""
9999
Syntax Error: Cannot parse the unexpected character '?'.
100100

tests/language/test_parser.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ def parse_provides_useful_errors():
6767
assert error.message == "Syntax Error: Expected Name, found <EOF>"
6868
assert error.positions == [1]
6969
assert error.locations == [(1, 2)]
70-
assert str(error) == dedent(
70+
assert str(error) + "\n" == dedent(
7171
"""
7272
Syntax Error: Expected Name, found <EOF>
7373
@@ -91,7 +91,7 @@ def parse_provides_useful_error_when_using_source():
9191
with raises(GraphQLSyntaxError) as exc_info:
9292
parse(Source("query", "MyQuery.graphql"))
9393
error = exc_info.value
94-
assert str(error) == (
94+
assert str(error) + "\n" == (
9595
"Syntax Error: Expected {, found <EOF>\n\n"
9696
"MyQuery.graphql:1:6\n1: query\n ^\n"
9797
)

tests/utilities/test_strip_ignored_characters.py

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,6 @@ def to_equal(self, expected: str):
6666
def to_stay_the_same(self):
6767
self.to_equal(self.doc_string)
6868

69-
def to_raise(self, expected_stringify_error):
70-
with raises(GraphQLSyntaxError) as exc_info:
71-
strip_ignored_characters(self.doc_string)
72-
assert str(exc_info.value) == expected_stringify_error
73-
7469

7570
def describe_strip_ignored_characters():
7671
def asserts_that_a_source_was_provided():
@@ -128,17 +123,18 @@ def strips_ignored_characters_from_graphql_sdl_document():
128123
)
129124

130125
def report_document_with_invalid_token():
131-
ExpectStripped('{ foo(arg: "\n"').to_raise(
132-
dedent(
133-
"""
134-
Syntax Error: Unterminated string.
135-
136-
GraphQL request:1:13
137-
1: { foo(arg: "
138-
^
139-
2: "
140-
"""
141-
)
126+
with raises(GraphQLSyntaxError) as exc_info:
127+
strip_ignored_characters('{ foo(arg: "\n"')
128+
129+
assert str(exc_info.value) + "\n" == dedent(
130+
"""
131+
Syntax Error: Unterminated string.
132+
133+
GraphQL request:1:13
134+
1: { foo(arg: "
135+
^
136+
2: "
137+
"""
142138
)
143139

144140
def strips_non_parsable_document():

0 commit comments

Comments
 (0)