From 326e7a2e3354c785feb91a05dcaa27397ce54a56 Mon Sep 17 00:00:00 2001 From: Isaac Bythewood Date: Sat, 12 May 2012 00:15:01 +0000 Subject: [PATCH] Splitting up some tests and more pep8 fixes. --- pinry/pins/tests.py | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/pinry/pins/tests.py b/pinry/pins/tests.py index 69e132a..52c6669 100644 --- a/pinry/pins/tests.py +++ b/pinry/pins/tests.py @@ -3,7 +3,11 @@ from django.test.client import Client from django.core.urlresolvers import reverse -class RecentPinsTest(TestCase): # pylint: disable-msg=R0904 +# pylint: disable-msg=E1103 +# pylint: disable-msg=R0904 + + +class RecentPinsTest(TestCase): def setUp(self): self.client = Client() self.url = reverse('pins:recent-pins') @@ -13,10 +17,10 @@ class RecentPinsTest(TestCase): # pylint: disable-msg=R0904 def test_status_code(self): response = self.client.get(self.url) - self.assertEqual(response.status_code, 200) # pylint: disable-msg=E1103 + self.assertEqual(response.status_code, 200) -class NewPinTest(TestCase): # pylint: disable-msg=R0904 +class NewPinTest(TestCase): def setUp(self): self.client = Client() self.url = reverse('pins:new-pin') @@ -26,29 +30,29 @@ class NewPinTest(TestCase): # pylint: disable-msg=R0904 def test_status_code(self): response = self.client.get(self.url) - self.assertEqual(response.status_code, 200) # pylint: disable-msg=E1103 + self.assertEqual(response.status_code, 200) def test_new_pin(self): response = self.client.post(self.url, { 'url': 'https://github.com/overshard/pinry/raw/master/' 'screenshot.png', }) - self.assertEqual(response.status_code, 302) # pylint: disable-msg=E1103 - - def test_new_pin_fail(self): - # Invalid protocol - response = self.client.post(self.url, { - 'url': 'ftp://github.com/overshard/pinry/raw/master/screenshot.png', - }) - self.assertEqual(response.status_code, 200) # pylint: disable-msg=E1103 + self.assertEqual(response.status_code, 302) - # Invalid file type. + def test_new_pin_invalid_protocol(self): + response = self.client.post(self.url, { + 'url': 'ftp://github.com/overshard/pinry/raw/master/' + 'screenshot.png', + }) + self.assertEqual(response.status_code, 200) + + def test_new_pin_invalid_file_type(self): response = self.client.post(self.url, { 'url': 'https://raw.github.com/overshard/pinry/master/README.md', }) - self.assertEqual(response.status_code, 200) # pylint: disable-msg=E1103 + self.assertEqual(response.status_code, 200) - # Already Pinned + def test_new_pin_already_pinned(self): response = self.client.post(self.url, { 'url': 'http://github.com/overshard/pinry/raw/master/' 'screenshot.png', @@ -57,4 +61,4 @@ class NewPinTest(TestCase): # pylint: disable-msg=R0904 'url': 'https://github.com/overshard/pinry/raw/master/' 'screenshot.png', }) - self.assertEqual(response.status_code, 200) # pylint: disable-msg=E1103 + self.assertEqual(response.status_code, 200)