Fix merge conflicts

This commit is contained in:
Griatch 2019-03-04 22:32:51 +01:00
commit 90b42ca6fb
47 changed files with 1682 additions and 201 deletions

View file

@ -691,8 +691,21 @@ from evennia.contrib import health_bar
class TestHealthBar(EvenniaTest):
def test_healthbar(self):
expected_bar_str = "|[G|w |n|[B|w test24 / 200test |n"
self.assertTrue(health_bar.display_meter(24, 200, length=40, pre_text="test", post_text="test", align="center") == expected_bar_str)
expected_bar_str = '|[R|w|n|[B|w test0 / 200test |n'
self.assertEqual(health_bar.display_meter(
0, 200, length=40, pre_text="test", post_text="test", align="center"), expected_bar_str)
expected_bar_str = "|[R|w |n|[B|w test24 / 200test |n"
self.assertEqual(health_bar.display_meter(
24, 200, length=40, pre_text="test", post_text="test", align="center"), expected_bar_str)
expected_bar_str = '|[Y|w test100 /|n|[B|w 200test |n'
self.assertEqual(health_bar.display_meter(
100, 200, length=40, pre_text="test", post_text="test", align="center"), expected_bar_str)
expected_bar_str = '|[G|w test180 / 200test |n|[B|w |n'
self.assertEqual(health_bar.display_meter(
180, 200, length=40, pre_text="test", post_text="test", align="center"), expected_bar_str)
expected_bar_str = '|[G|w test200 / 200test |n|[B|w|n'
self.assertEqual(health_bar.display_meter(
200, 200, length=40, pre_text="test", post_text="test", align="center"), expected_bar_str)
# test mail contrib