Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolve merge conflicts

Browse source
This commit is contained in:
Griatch 2019-03-17 13:43:06 +01:00
commit 1c9ca4b11c
5 changed files with 216 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

26
evennia/contrib/tests.py
View file

@ -242,14 +242,24 @@ class TestExtendedRoom(CommandTest):
self.call(extended_room.CmdExtendedLook(), "testdetail", self.DETAIL_DESC)
self.call(extended_room.CmdExtendedLook(), "nonexistent", "Could not find 'nonexistent'.")
def test_cmdextendeddesc(self):
self.call(extended_room.CmdExtendedDesc(), "", "Details on Room", cmdstring="detail")
self.call(extended_room.CmdExtendedDesc(), "thingie = newdetail with spaces",
"Set Detail thingie to 'newdetail with spaces'.", cmdstring="detail")
self.call(extended_room.CmdExtendedDesc(), "thingie", "Detail 'thingie' on Room:\n", cmdstring="detail")
self.call(extended_room.CmdExtendedDesc(), "/del thingie", "Detail thingie deleted, if it existed.", cmdstring="detail")
self.call(extended_room.CmdExtendedDesc(), "thingie", "Detail 'thingie' not found.", cmdstring="detail")
self.call(extended_room.CmdExtendedDesc(), "", "Descriptions on Room:")
def test_cmdsetdetail(self):
self.call(extended_room.CmdSetDetail(), "", "Details on Room")
self.call(extended_room.CmdSetDetail(), "thingie = newdetail with spaces",
"Detail set 'thingie': 'newdetail with spaces'")
self.call(extended_room.CmdSetDetail(), "thingie", "Detail 'thingie' on Room:\n")
self.call(extended_room.CmdSetDetail(), "/del thingie", "Detail thingie deleted, if it existed.", cmdstring="detail")
self.call(extended_room.CmdSetDetail(), "thingie", "Detail 'thingie' not found.")
# Test with aliases
self.call(extended_room.CmdSetDetail(), "", "Details on Room")
self.call(extended_room.CmdSetDetail(), "thingie;other;stuff = newdetail with spaces",
"Detail set 'thingie;other;stuff': 'newdetail with spaces'")
self.call(extended_room.CmdSetDetail(), "thingie", "Detail 'thingie' on Room:\n")
self.call(extended_room.CmdSetDetail(), "other", "Detail 'other' on Room:\n")
self.call(extended_room.CmdSetDetail(), "stuff", "Detail 'stuff' on Room:\n")
self.call(extended_room.CmdSetDetail(), "/del other;stuff", "Detail other;stuff deleted, if it existed.")
self.call(extended_room.CmdSetDetail(), "other", "Detail 'other' not found.")
self.call(extended_room.CmdSetDetail(), "stuff", "Detail 'stuff' not found.")
def test_cmdgametime(self):
self.call(extended_room.CmdGameTime(), "", "It's a spring day, in the evening.")