Skip to content

Commit

Permalink
whitespace
Browse files Browse the repository at this point in the history
  • Loading branch information
jtauber committed Aug 1, 2014
1 parent 7272e12 commit 64a2390
Show file tree
Hide file tree
Showing 6 changed files with 43 additions and 43 deletions.
2 changes: 1 addition & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
include LICENSE
include README.rst
include README.rst
2 changes: 1 addition & 1 deletion dialogos/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from dialogos.models import Comment


class CommentAdmin(admin.ModelAdmin):
class CommentAdmin(admin.ModelAdmin):
list_display = ["author", "content_type", "public"]
list_filter = ["public", "content_type"]

Expand Down
8 changes: 4 additions & 4 deletions dialogos/authorization.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,17 @@ def default_can_edit(user, comment):

def load_can_delete():
import_path = getattr(settings, "COMMENTS_CAN_DELETE_CALLABLE", None)

if import_path is None:
return default_can_delete

return load_path_attr(import_path)


def load_can_edit():
import_path = getattr(settings, "COMMENTS_CAN_EDIT_CALLABLE", None)

if import_path is None:
return default_can_edit

return load_path_attr(import_path)
6 changes: 3 additions & 3 deletions dialogos/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@


class CommentForm(forms.ModelForm):

class Meta:
model = Comment
fields = [
"name", "email", "website", "comment"
]

def __init__(self, *args, **kwargs):
self.request = kwargs.pop("request", None)
self.obj = kwargs.pop("obj")
Expand All @@ -22,7 +22,7 @@ def __init__(self, *args, **kwargs):
del self.fields["name"]
del self.fields["email"]
del self.fields["website"]

def save(self, commit=True):
comment = super(CommentForm, self).save(commit=False)
comment.ip_address = self.request.META.get("REMOTE_ADDR", None)
Expand Down
12 changes: 6 additions & 6 deletions dialogos/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,22 @@


class Comment(models.Model):

author = models.ForeignKey(User, null=True, related_name="comments")

name = models.CharField(max_length=100)
email = models.CharField(max_length=255, blank=True)
website = models.CharField(max_length=255, blank=True)

content_type = models.ForeignKey(ContentType)
object_id = models.IntegerField()
content_object = GenericForeignKey()

comment = models.TextField()

submit_date = models.DateTimeField(default=datetime.now)
ip_address = models.IPAddressField(null=True)
public = models.BooleanField(default=True)

def __unicode__(self):
return "pk=%d" % self.pk
56 changes: 28 additions & 28 deletions dialogos/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ def __init__(self, testcase, user, password):
success,
"login with username=%r, password=%r failed" % (user, password)
)

def __enter__(self):
pass

def __exit__(self, *args):
self.testcase.client.logout()

Expand All @@ -29,101 +29,101 @@ class TestCaseMixin(object):
def get(self, url_name, *args, **kwargs):
data = kwargs.pop("data", {})
return self.client.get(reverse(url_name, args=args, kwargs=kwargs), data)

def getajax(self, url_name, *args, **kwargs):
data = kwargs.pop("data", {})
return self.client.get(reverse(url_name, args=args, kwargs=kwargs), data,
HTTP_X_REQUESTED_WITH="XMLHttpRequest")

def post(self, url_name, *args, **kwargs):
data = kwargs.pop("data", {})
return self.client.post(reverse(url_name, args=args, kwargs=kwargs), data)

def postajax(self, url_name, *args, **kwargs):
data = kwargs.pop("data", {})
return self.client.post(reverse(url_name, args=args, kwargs=kwargs), data,
HTTP_X_REQUESTED_WITH="XMLHttpRequest")

def login(self, user, password):
return login(self, user, password)

def reload(self, obj):
return obj.__class__._default_manager.get(pk=obj.pk)

def assert_renders(self, tmpl, context, value):
tmpl = Template(tmpl)
self.assertEqual(tmpl.render(context), value)


class CommentTests(TestCaseMixin, TestCase):

def setUp(self):
self.user = User.objects.create_user("gimli", "myaxe@dwarf.org", "gloin")
self.user2 = User.objects.create_user("aragorn", "theking@gondor.gov", "strider")

def assert_renders(self, tmpl, context, value):
tmpl = Template(tmpl)
self.assertEqual(tmpl.render(context), value)

def post_comment(self, obj, data):
return self.post("post_comment",
content_type_id=ContentType.objects.get_for_model(obj).pk,
object_id=obj.pk,
data=data
)

def test_post_comment(self):
g = User.objects.create(username="Gandalf")

response = self.post_comment(g, data={
"name": "Frodo Baggins",
"comment": "Where'd you go?",
})
self.assertEqual(response.status_code, 302)

self.assertEqual(Comment.objects.count(), 1)
c = Comment.objects.get()
self.assertEqual(c.author, None)
self.assertEqual(c.name, "Frodo Baggins")

response = self.post_comment(g, data={
"comment": "Where is everyone?"
})
self.assertEqual(Comment.objects.count(), 1)

with self.login("gimli", "gloin"):
response = self.post_comment(g, data={
"comment": "I thought you were watching the hobbits?"
})
self.assertEqual(response.status_code, 302)
self.assertEqual(Comment.objects.count(), 2)

c = Comment.objects.order_by("id")[1]
self.assertEqual(c.comment, "I thought you were watching the hobbits?")
self.assertEqual(c.author, self.user)

def test_delete_comment(self):
g = User.objects.create(username="Boromir")
with self.login("gimli", "gloin"):
response = self.post_comment(g, data={
"comment": "Wow, you're a jerk.",
})
comment = Comment.objects.get()

response = self.post("delete_comment", comment_id=comment.pk)
self.assertEqual(response.status_code, 302)
self.assertEqual(Comment.objects.count(), 1)

with self.login("aragorn", "strider"):
response = self.post("delete_comment", comment_id=comment.pk)
self.assertEqual(response.status_code, 302)
self.assertEqual(Comment.objects.count(), 1)

with self.login("gimli", "gloin"):
response = self.post("delete_comment", comment_id=comment.pk)
self.assertEqual(response.status_code, 302)
self.assertEqual(Comment.objects.count(), 0)

def test_ttag_comment_count(self):
g = User.objects.create(username="Sauron")
self.post_comment(g, data={
Expand All @@ -134,13 +134,13 @@ def test_ttag_comment_count(self):
"name": "Gollum",
"comment": "We wants our precious",
})

self.assert_renders(
"{% load dialogos_tags %}{% comment_count o %}",
Context({"o": g}),
"2"
)

def test_ttag_comments(self):
g = User.objects.create(username="Sauron")
self.post_comment(g, data={
Expand All @@ -151,15 +151,15 @@ def test_ttag_comments(self):
"name": "Gollum",
"comment": "We wants our precious",
})

c = Context({"o": g})
self.assert_renders(
"{% load dialogos_tags %}{% comments o as cs %}",
c,
""
)
self.assertEqual(list(c["cs"]), list(Comment.objects.all()))

def test_ttag_comment_form(self):
g = User.objects.create(username="Sauron")
c = Context({"o": g})
Expand All @@ -169,7 +169,7 @@ def test_ttag_comment_form(self):
""
)
self.assertTrue(isinstance(c["comment_form"], CommentForm))

with self.login("gimli", "gloin"):
c = Context({"o": g, "user": self.user})
self.assert_renders(
Expand All @@ -178,7 +178,7 @@ def test_ttag_comment_form(self):
""
)
self.assertTrue(isinstance(c["comment_form"], CommentForm))

def test_ttag_comment_target(self):
g = User.objects.create(username="legolas")
self.assert_renders(
Expand Down

0 comments on commit 64a2390

Please sign in to comment.