Move user functions to user app, replace urls with snake case, replac…

…e now depreciated reversing by dotted path

django_reddit/urls.py

@@ -22,5 +22,6 @@
     url(settings.ADMIN_URL, include(admin.site.urls)),
     # url(r'^$', TemplateView.as_view(template_name='index.html'), name="home"),
     # url(r'^users/', include('users.urls')),
-    url(r'^', include("reddit.urls"))
+    url(r'^', include("reddit.urls")),
+    url(r'^', include("users.urls"))
 ]

reddit/migrations/0001_initial.py

@@ -65,7 +65,7 @@ class Migration(migrations.Migration):
             },
         ),
         migrations.CreateModel(
-            name='Vote',
+            name='vote',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('vote_object_id', models.PositiveIntegerField()),

reddit/tests/test_comments.py

@@ -66,7 +66,7 @@ def setUp(self):
 
     def test_valid_public_comment_view(self):
         self.c.logout()
-        r = self.c.get(reverse('Thread', args=(1,)))
+        r = self.c.get(reverse('thread', args=(1,)))
         submission = Submission.objects.get(id=1)
         self.assertEqual(r.status_code, 200)
         self.assertEqual(r.context['submission'], submission)
@@ -78,15 +78,15 @@ def test_valid_public_comment_view(self):
 
     def test_comment_votes(self):
         self.c.login(**self.credentials)
-        r = self.c.get(reverse('Thread', args=(1,)))
+        r = self.c.get(reverse('thread', args=(1,)))
         self.assertEqual(r.status_code, 200)
         self.assertEqual(r.context['sub_vote'], 1)
         self.assertEqual(r.context['comment_votes'], {1: 1, 5: -1})
         self.assertContains(r, 'root comment', count=3)
         self.assertContains(r, 'reply comment', count=2)
 
     def test_invalid_thread_id(self):
-        r = self.c.get(reverse('Thread', args=(123,)))
+        r = self.c.get(reverse('thread', args=(123,)))
         self.assertEqual(r.status_code, 404)
 
 
@@ -107,22 +107,22 @@ def setUp(self):
         )
 
     def test_post_only(self):
-        r = self.c.get(reverse('Post Comment'))
+        r = self.c.get(reverse('post_comment'))
         self.assertIsInstance(r, HttpResponseNotAllowed)
 
     def test_logged_out(self):
-        r = self.c.post(reverse('Post Comment'))
+        r = self.c.post(reverse('post_comment'))
         self.assertEqual(r.status_code, 200)
         json_response = json.loads(r.content.decode("utf-8"))
         self.assertEqual(json_response['msg'], "You need to log in to post new comments.")
 
     def test_missing_type_or_id(self):
         self.c.login(**self.credentials)
         for key in ['parentType', 'parentId']:
-            r = self.c.post(reverse('Post Comment'),
+            r = self.c.post(reverse('post_comment'),
                             data={key: 'comment'})
             self.assertIsInstance(r, HttpResponseBadRequest)
-        r = self.c.post(reverse('Post Comment'),
+        r = self.c.post(reverse('post_comment'),
                         data={'parentType': 'InvalidType',
                               'parentId': 1})
         self.assertIsInstance(r, HttpResponseBadRequest)
@@ -134,7 +134,7 @@ def test_no_comment_text(self):
             'parentId': 1,
             'commentContent': ''
         }
-        r = self.c.post(reverse('Post Comment'), data=test_data)
+        r = self.c.post(reverse('post_comment'), data=test_data)
         self.assertEqual(r.status_code, 200)
         json_response = json.loads(r.content.decode("utf-8"))
         self.assertEqual(json_response['msg'],
@@ -147,7 +147,7 @@ def test_invalid_or_wrong_parent_id(self):
             'parentId': 'invalid',
             'commentContent': 'content'
         }
-        r = self.c.post(reverse('Post Comment'), data=test_data)
+        r = self.c.post(reverse('post_comment'), data=test_data)
         self.assertIsInstance(r, HttpResponseBadRequest)
 
         test_data = {
@@ -156,7 +156,7 @@ def test_invalid_or_wrong_parent_id(self):
             'commentContent': 'content'
         }
 
-        r = self.c.post(reverse('Post Comment'), data=test_data)
+        r = self.c.post(reverse('post_comment'), data=test_data)
         self.assertIsInstance(r, HttpResponseBadRequest)
 
         test_data = {
@@ -165,7 +165,7 @@ def test_invalid_or_wrong_parent_id(self):
             'commentContent': 'content'
         }
 
-        r = self.c.post(reverse('Post Comment'), data=test_data)
+        r = self.c.post(reverse('post_comment'), data=test_data)
         self.assertIsInstance(r, HttpResponseBadRequest)
 
     def test_valid_comment_posting_thread(self):
@@ -176,7 +176,7 @@ def test_valid_comment_posting_thread(self):
             'commentContent': 'thread root comment'
         }
 
-        r = self.c.post(reverse('Post Comment'), data=test_data)
+        r = self.c.post(reverse('post_comment'), data=test_data)
         self.assertEqual(r.status_code, 200)
         json_r = json.loads(r.content.decode("utf-8"))
         self.assertEqual(json_r['msg'], 'Your comment has been posted.')
@@ -204,7 +204,7 @@ def test_valid_comment_posting_reply(self):
             'commentContent': 'thread reply comment'
         }
 
-        r = self.c.post(reverse('Post Comment'), data=test_data)
+        r = self.c.post(reverse('post_comment'), data=test_data)
         self.assertEqual(r.status_code, 200)
         json_r = json.loads(r.content.decode("utf-8"))
         self.assertEqual(json_r['msg'], 'Your comment has been posted.')

reddit/tests/test_frontpage.py

@@ -21,31 +21,31 @@ def test_submission_count(self):
         self.assertEqual(Submission.objects.all().count(), 50)
 
     def test_no_page_number(self):
-        r = self.c.get(reverse('Frontpage'))
+        r = self.c.get(reverse('frontpage'))
         self.assertEqual(len(r.context['submissions']), 25)
         self.assertEqual(r.context['submissions'].number, 1)
         self.assertFalse(r.context['submissions'].has_previous())
         self.assertTrue(r.context['submissions'].has_next())
 
     def test_valid_page_number(self):
-        r = self.c.get(reverse('Frontpage'), data={'page': 1})
+        r = self.c.get(reverse('frontpage'), data={'page': 1})
         self.assertEqual(len(r.context['submissions']), 25)
         first_page_submissions = r.context['submissions']
         self.assertFalse(r.context['submissions'].has_previous())
 
-        r = self.c.get(reverse('Frontpage'), data={'page': 2})
+        r = self.c.get(reverse('frontpage'), data={'page': 2})
         self.assertEqual(len(r.context['submissions']), 25)
         second_page_submissions = r.context['submissions']
         self.assertNotEqual(first_page_submissions, second_page_submissions)
 
         self.assertFalse(r.context['submissions'].has_next())
 
     def test_invalid_page_number(self):
-        r = self.c.get(reverse('Frontpage'), data={'page': "something"}, follow=True)
+        r = self.c.get(reverse('frontpage'), data={'page': "something"}, follow=True)
         self.assertEqual(r.status_code, 404)
 
     def test_wrong_page_number(self):
-        r = self.c.get(reverse('Frontpage'), data={'page': 10}, follow=True)
+        r = self.c.get(reverse('frontpage'), data={'page': 10}, follow=True)
         self.assertEqual(r.context['submissions'].number, 2)
         self.assertFalse(r.context['submissions'].has_next())
 
@@ -78,13 +78,13 @@ def setUp(self):
                         vote_value=-1).save()
 
     def test_logged_out(self):
-        r = self.c.get(reverse('Frontpage'))
+        r = self.c.get(reverse('frontpage'))
         self.assertEqual(r.context['submission_votes'], {},
                          msg="Logged out user got some submission votes data")
 
     def test_logged_in(self):
         self.c.login(username='username', password='password')
-        r = self.c.get(reverse('Frontpage'))
+        r = self.c.get(reverse('frontpage'))
         self.assertEqual(len(r.context['submission_votes']), 5)
 
         upvote_keys = []
@@ -102,7 +102,7 @@ def test_logged_in(self):
 
     def test_second_page(self):
         self.c.login(username='username', password='password')
-        r = self.c.get(reverse('Frontpage'), data={'page': 2})
+        r = self.c.get(reverse('frontpage'), data={'page': 2})
         self.assertEqual(len(r.context['submission_votes']), 4)
 
         upvote_keys = []

reddit/tests/test_profile.py

@@ -21,7 +21,7 @@ def setUp(self):
         r.github = "example"
 
     def test_existing_username(self):
-        r = self.c.get(reverse('User Profile', args=('username',)))
+        r = self.c.get(reverse('user_profile', args=('username',)))
         self.assertEqual(r.status_code, 200)
         self.assertContains(r, '(username)')
         self.assertContains(r, 'compose?to=username')
@@ -33,13 +33,13 @@ def test_existing_username(self):
 
     def test_own_username(self):
         self.assertTrue(self.c.login(username='username', password='password'))
-        r = self.c.get(reverse('User Profile', args=('username',)))
+        r = self.c.get(reverse('user_profile', args=('username',)))
         self.assertContains(r, '/profile/edit')
         self.assertNotContains(r, 'compose?to=username')
         self.c.logout()
 
     def test_invalid_username(self):
-        r = self.c.get(reverse('User Profile', args=('none',)))
+        r = self.c.get(reverse('user_profile', args=('none',)))
         self.assertEqual(r.status_code, 404)
 
 
@@ -116,26 +116,26 @@ def setUp(self):
         }
 
     def test_not_logged_in(self):
-        r = self.c.get(reverse('Edit Profile'))
-        self.assertRedirects(r, reverse('Login') + '?next=' + reverse('Edit Profile'))
+        r = self.c.get(reverse('edit_profile'))
+        self.assertRedirects(r, reverse('login') + '?next=' + reverse('edit_profile'))
 
     def test_invalid_request(self):
         self.c.login(username='profiletest',
                      password='password')
-        r = self.c.delete(reverse('Edit Profile'))
+        r = self.c.delete(reverse('edit_profile'))
         self.assertEqual(r.status_code, 404)
 
     def test_form_view(self):
         self.c.login(username='profiletest',
                      password='password')
-        r = self.c.get(reverse('Edit Profile'))
+        r = self.c.get(reverse('edit_profile'))
         self.assertIsInstance(r.context['form'], ProfileForm)
 
     def test_form_submit(self):
         self.c.login(username='profiletest',
                      password='password')
 
-        r = self.c.post(reverse('Edit Profile'), data=self.valid_data)
+        r = self.c.post(reverse('edit_profile'), data=self.valid_data)
         self.assertEqual(r.status_code, 200)
 
         user = RedditUser.objects.get(user=User.objects.get(

reddit/tests/test_submission.py

@@ -47,14 +47,14 @@ def setUp(self):
         )
 
     def test_logged_out(self):
-        r = self.c.get(reverse('Submit'))
+        r = self.c.get(reverse('submit'))
         self.assertRedirects(r, "{}?next={}".format(
-            reverse('Login'), reverse('Submit')
+            reverse('login'), reverse('submit')
         ))
 
     def test_logged_in_GET(self):
         self.c.login(**self.login_data)
-        r = self.c.get(reverse('Submit'))
+        r = self.c.get(reverse('submit'))
         self.assertIsInstance(r.context['form'], SubmissionForm)
 
     def test_making_a_submission(self):
@@ -64,10 +64,10 @@ def test_making_a_submission(self):
             'url': 'http://example.com',
             'text': 'submission text'
         }
-        r = self.c.post(reverse('Submit'), data=test_data, follow=True)
+        r = self.c.post(reverse('submit'), data=test_data, follow=True)
         submission = Submission.objects.filter(**test_data).first()
         self.assertIsNotNone(submission)
-        self.assertRedirects(r, reverse('Thread', args=(submission.id,)))
+        self.assertRedirects(r, reverse('thread', args=(submission.id,)))
         self.assertContains(r, 'Submission created')
 
     def test_missing_fields(self):
@@ -77,6 +77,6 @@ def test_missing_fields(self):
             'url': 'http://example.com',
             'text': 'submission text'
         }
-        r = self.c.post(reverse('Submit'), data=test_data)
+        r = self.c.post(reverse('submit'), data=test_data)
         self.assertNotContains(r, 'Submission created')
         self.assertContains(r, 'This field is required.')

reddit/tests/test_voting.py

@@ -32,7 +32,7 @@ def setUp(self):
                        parent=submission).save()
 
     def test_post_only(self):
-        r = self.c.get(reverse('Vote'))
+        r = self.c.get(reverse('vote'))
         self.assertIsInstance(r, HttpResponseNotAllowed)
 
     def test_logged_out(self):
@@ -42,7 +42,7 @@ def test_logged_out(self):
             'vote_value': 1
         }
 
-        r = self.c.post(reverse('Vote'), data=test_data)
+        r = self.c.post(reverse('vote'), data=test_data)
         self.assertIsInstance(r, HttpResponseForbidden)
 
     def test_invalid_vote_value(self):
@@ -52,30 +52,30 @@ def test_invalid_vote_value(self):
             'what_id': 1,
             'vote_value': '2'
         }
-        r = self.c.post(reverse('Vote'), data=test_data)
+        r = self.c.post(reverse('vote'), data=test_data)
         self.assertIsInstance(r, HttpResponseBadRequest)
 
     def test_missing_arugmnets(self):
         self.c.login(**self.credentials)
-        r = self.c.post(reverse('Vote'),
+        r = self.c.post(reverse('vote'),
                         data={
                             'what': 'submission',
                             'what_id': 1
                         })
         self.assertIsInstance(r, HttpResponseBadRequest)
-        r = self.c.post(reverse('Vote'),
+        r = self.c.post(reverse('vote'),
                         data={
                             'what': 'submission',
                             'vote_value': '1'
                         })
         self.assertIsInstance(r, HttpResponseBadRequest)
-        r = self.c.post(reverse('Vote'),
+        r = self.c.post(reverse('vote'),
                         data={
                             'what_id': '1',
                             'vote_value': '1'
                         })
         self.assertIsInstance(r, HttpResponseBadRequest)
-        r = self.c.post(reverse('Vote'), data={})
+        r = self.c.post(reverse('vote'), data={})
         self.assertIsInstance(r, HttpResponseBadRequest)
 
     def test_invalid_vote_object_id(self):
@@ -86,14 +86,14 @@ def test_invalid_vote_object_id(self):
                 'what_id': 9999,
                 'what_value': '1'
             }
-            r = self.c.post(reverse('Vote'), data=test_data)
+            r = self.c.post(reverse('vote'), data=test_data)
             self.assertIsInstance(r, HttpResponseBadRequest)
 
     def test_submission_first_vote(self):
         submission = Submission.objects.filter(title="vote testing").first()
         self.assertIsNotNone(submission)
         self.c.login(**self.credentials)
-        r = self.c.post(reverse('Vote'),
+        r = self.c.post(reverse('vote'),
                         data={
                             'what': 'submission',
                             'what_id': submission.id,
@@ -115,7 +115,7 @@ def test_submission_vote_cancel_or_reverse(self):
         Vote.create(user=user, vote_object=submission, vote_value=1).save()
 
         self.c.login(**self.credentials)
-        r = self.c.post(reverse('Vote'),
+        r = self.c.post(reverse('vote'),
                         data={
                             'what': 'submission',
                             'what_id': submission.id,
@@ -133,7 +133,7 @@ def test_submission_vote_cancel_or_reverse(self):
         vote.save()
 
         self.c.login(**self.credentials)
-        r = self.c.post(reverse('Vote'),
+        r = self.c.post(reverse('vote'),
                         data={
                             'what': 'submission',
                             'what_id': submission.id,
@@ -150,7 +150,7 @@ def test_comment_first_vote(self):
         comment = Comment.objects.filter(submission=submission).first()
         self.assertIsNotNone(comment)
         self.c.login(**self.credentials)
-        r = self.c.post(reverse('Vote'),
+        r = self.c.post(reverse('vote'),
                         data={
                             'what': 'comment',
                             'what_id': comment.id,
@@ -174,7 +174,7 @@ def test_comment_vote_cancel_or_reverse(self):
         Vote.create(user=user, vote_object=comment, vote_value=1).save()
 
         self.c.login(**self.credentials)
-        r = self.c.post(reverse('Vote'),
+        r = self.c.post(reverse('vote'),
                         data={
                             'what': 'comment',
                             'what_id': comment.id,
@@ -192,7 +192,7 @@ def test_comment_vote_cancel_or_reverse(self):
         vote.save()
 
         self.c.login(**self.credentials)
-        r = self.c.post(reverse('Vote'),
+        r = self.c.post(reverse('vote'),
                         data={
                             'what': 'comment',
                             'what_id': comment.id,