Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-26 17:56:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Renames methods to web_get_* and fixes tests.

Browse source
This commit is contained in:
Johnny 2018-10-22 20:33:56 +00:00
parent b37e3a8b25
commit a5b759cff0
3 changed files with 12 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

6
evennia/accounts/tests.py
View file

@ -64,14 +64,14 @@ class TestDefaultAccount(TestCase):
"Get URL for account detail page on website"
self.account = create.create_account("TestAccount%s" % randint(100000, 999999),
email="test@test.com", password="testpassword", typeclass=DefaultAccount)
self.assertTrue(self.account.web_detail_url())
self.assertTrue(self.account.web_get_detail_url())
def test_admin_url(self):
"Get object's URL for access via Admin pane"
self.account = create.create_account("TestAccount%s" % randint(100000, 999999),
email="test@test.com", password="testpassword", typeclass=DefaultAccount)
self.assertTrue(self.account.web_admin_url())
self.assertTrue(self.account.web_admin_url() != '#')
self.assertTrue(self.account.web_get_admin_url())
self.assertTrue(self.account.web_get_admin_url() != '#')
def test_password_validation(self):
"Check password validators deny bad passwords"

4
evennia/objects/tests.py
View file

@ -5,7 +5,7 @@ class DefaultObjectTest(EvenniaTest):
def test_urls(self):
"Make sure objects are returning URLs"
self.assertTrue(self.char1.get_absolute_url())
self.assertTrue('admin' in self.char1.get_admin_url())
self.assertTrue('admin' in self.char1.web_get_admin_url())
self.assertTrue(self.room1.get_absolute_url())
self.assertTrue('admin' in self.room1.get_admin_url())
self.assertTrue('admin' in self.room1.web_get_admin_url())

24
evennia/typeclasses/models.py
View file

@ -741,7 +741,7 @@ class TypedObject(SharedMemoryModel):
# Web/Django methods
#
def web_admin_url(self):
def web_get_admin_url(self):
"""
Returns the URI path for the Django Admin page for this object.
@ -755,7 +755,7 @@ class TypedObject(SharedMemoryModel):
return reverse("admin:%s_%s_change" % (content_type.app_label, content_type.model), args=(self.id,))
@classmethod
def web_create_url(cls):
def web_get_create_url(cls):
"""
Returns the URI path for a View that allows users to create new
instances of this object.
@ -783,7 +783,7 @@ class TypedObject(SharedMemoryModel):
try: return reverse('%s-create' % cls._meta.verbose_name.lower())
except: return '#'
def web_detail_url(self):
def web_get_detail_url(self):
"""
Returns the URI path for a View that allows users to view details for
this object.
@ -811,7 +811,7 @@ class TypedObject(SharedMemoryModel):
try: return reverse('%s-detail' % self._meta.verbose_name.lower(), kwargs={'pk': self.pk, 'slug': slugify(self.name)})
except: return '#'
def web_update_url(self):
def web_get_update_url(self):
"""
Returns the URI path for a View that allows users to update this
object.
@ -839,7 +839,7 @@ class TypedObject(SharedMemoryModel):
try: return reverse('%s-update' % self._meta.verbose_name.lower(), kwargs={'pk': self.pk, 'slug': slugify(self.name)})
except: return '#'
def web_delete_url(self):
def web_get_delete_url(self):
"""
Returns the URI path for a View that allows users to delete this object.
@ -866,15 +866,5 @@ class TypedObject(SharedMemoryModel):
try: return reverse('%s-delete' % self._meta.verbose_name.lower(), kwargs={'pk': self.pk, 'slug': slugify(self.name)})
except: return '#'
def get_absolute_url(self):
"""
Django construct; used by Django Sites framework and within the Admin
panel for reverse linking to the object detail page.
https://docs.djangoproject.com/en/2.1/ref/models/instances/#get-absolute-url
Returns:
path (str): URI path to object detail page, if defined.
"""
return self.web_detail_url()
# Used by Django Sites/Admin
get_absolute_url = web_get_detail_url