alihan/textual
1
0
Fork 0
mirror of https://github.com/Textualize/textual.git synced 2025-10-17 02:38:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Stop black from formatting tests

Browse Source
This commit is contained in:
Darren Burns
2022-01-19 15:02:01 +00:00
parent fd47ef491b
commit baba4ceed8
3 changed files with 18 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.pre-commit-config.yaml
View File

@@ -11,3 +11,4 @@ repos:
rev: 21.8b0 rev: 21.8b0
hooks: hooks:
- id: black - id: black
exclude: ^tests/

6
src/textual/css/_styles_builder.py
View File

@@ -412,7 +412,7 @@ class StylesBuilder:
if group: if group:
yield group yield group
valid_duration_token_types = ("duration", "number") valid_duration_token_names = ("duration", "number")
for tokens in make_groups(): for tokens in make_groups():
css_property = "" css_property = ""
duration = 1.0 duration = 1.0
@@ -427,7 +427,7 @@ class StylesBuilder:
css_property = token.value css_property = token.value
token = next(iter_tokens) token = next(iter_tokens)
if token.name not in valid_duration_token_types: if token.name not in valid_duration_token_names:
self.error(name, token, "expected duration or number") self.error(name, token, "expected duration or number")
try: try:
duration = _duration_as_seconds(token.value) duration = _duration_as_seconds(token.value)
@@ -447,7 +447,7 @@ class StylesBuilder:
easing = token.value easing = token.value
token = next(iter_tokens) token = next(iter_tokens)
if token.name not in valid_duration_token_types: if token.name not in valid_duration_token_names:
self.error(name, token, "expected duration or number") self.error(name, token, "expected duration or number")
try: try:
delay = _duration_as_seconds(token.value) delay = _duration_as_seconds(token.value)

67
tests/test_css_parse.py
View File

@@ -30,29 +30,11 @@ def test_parse_text_background():
assert styles.text_background == Color("red", type=ColorType.STANDARD, number=1) assert styles.text_background == Color("red", type=ColorType.STANDARD, number=1)
@pytest.mark.parametrize( @pytest.mark.parametrize("offset_x, parsed_x, offset_y, parsed_y", [
"offset_x, parsed_x, offset_y, parsed_y", ["-5.5%", Scalar(-5.5, Unit.PERCENT, Unit.WIDTH), "-30%", Scalar(-30, Unit.PERCENT, Unit.HEIGHT)],
[ ["5%", Scalar(5, Unit.PERCENT, Unit.WIDTH), "40%", Scalar(40, Unit.PERCENT, Unit.HEIGHT)],
[ ["10", Scalar(10, Unit.CELLS, Unit.WIDTH), "40", Scalar(40, Unit.CELLS, Unit.HEIGHT)],
"-5.5%", ])
Scalar(-5.5, Unit.PERCENT, Unit.WIDTH),
"-30%",
Scalar(-30, Unit.PERCENT, Unit.HEIGHT),
],
[
"5%",
Scalar(5, Unit.PERCENT, Unit.WIDTH),
"40%",
Scalar(40, Unit.PERCENT, Unit.HEIGHT),
],
[
"10",
Scalar(10, Unit.CELLS, Unit.WIDTH),
"40",
Scalar(40, Unit.CELLS, Unit.HEIGHT),
],
],
)
def test_parse_offset_composite_rule(offset_x, parsed_x, offset_y, parsed_y): def test_parse_offset_composite_rule(offset_x, parsed_x, offset_y, parsed_y):
css = f"""#some-widget {{ css = f"""#some-widget {{
offset: {offset_x} {offset_y}; offset: {offset_x} {offset_y};
@@ -69,29 +51,11 @@ def test_parse_offset_composite_rule(offset_x, parsed_x, offset_y, parsed_y):
assert styles.offset.y == parsed_y assert styles.offset.y == parsed_y
@pytest.mark.parametrize( @pytest.mark.parametrize("offset_x, parsed_x, offset_y, parsed_y", [
"offset_x, parsed_x, offset_y, parsed_y", ["-5.5%", Scalar(-5.5, Unit.PERCENT, Unit.WIDTH), "-30%", Scalar(-30, Unit.PERCENT, Unit.HEIGHT)],
[ ["5%", Scalar(5, Unit.PERCENT, Unit.WIDTH), "40%", Scalar(40, Unit.PERCENT, Unit.HEIGHT)],
[ ["10", Scalar(10, Unit.CELLS, Unit.WIDTH), "40", Scalar(40, Unit.CELLS, Unit.HEIGHT)],
"-5.5%", ])
Scalar(-5.5, Unit.PERCENT, Unit.WIDTH),
"-30%",
Scalar(-30, Unit.PERCENT, Unit.HEIGHT),
],
[
"5%",
Scalar(5, Unit.PERCENT, Unit.WIDTH),
"40%",
Scalar(40, Unit.PERCENT, Unit.HEIGHT),
],
[
"10",
Scalar(10, Unit.CELLS, Unit.WIDTH),
"40",
Scalar(40, Unit.CELLS, Unit.HEIGHT),
],
],
)
def test_parse_offset_separate_rules(offset_x, parsed_x, offset_y, parsed_y): def test_parse_offset_separate_rules(offset_x, parsed_x, offset_y, parsed_y):
css = f"""#some-widget {{ css = f"""#some-widget {{
offset-x: {offset_x}; offset-x: {offset_x};
@@ -110,15 +74,14 @@ def test_parse_offset_separate_rules(offset_x, parsed_x, offset_y, parsed_y):
@pytest.mark.parametrize( @pytest.mark.parametrize(
"duration, parsed_duration", "duration, parsed_duration", [
[
["5.57s", 5.57], ["5.57s", 5.57],
["0.5s", 0.5], ["0.5s", 0.5],
["1200ms", 1.2], ["1200ms", 1.2],
["0.5ms", 0.0005], ["0.5ms", 0.0005],
["20", 20.0], ["20", 20.],
["0.1", 0.1], ["0.1", 0.1],
], ]
) )
def test_parse_transition(duration, parsed_duration): def test_parse_transition(duration, parsed_duration):
easing = "in_out_cubic" easing = "in_out_cubic"
@@ -135,9 +98,7 @@ def test_parse_transition(duration, parsed_duration):
assert len(stylesheet.rules) == 1 assert len(stylesheet.rules) == 1
assert stylesheet.rules[0].errors == [] assert stylesheet.rules[0].errors == []
assert styles.transitions == { assert styles.transitions == {
"offset": Transition( "offset": Transition(duration=parsed_duration, easing=easing, delay=parsed_duration)
duration=parsed_duration, easing=easing, delay=parsed_duration
)
} }