Reorganized some tests, changes to travis.yml, and making changes to …

…models.

imagersite/imager_images/models.py

@@ -31,7 +31,7 @@ class Album(models.Model):
     """Create an album model."""
 
     user = models.ForeignKey(ImagerProfile, related_name='album', on_delete=models.CASCADE)
-    photo = models.ManyToManyField(Photo)
+    photo = models.ManyToManyField(Photo, related_name='album')
     title = models.CharField(max_length=50, blank=True, null=True)
     description = models.TextField(blank=True, null=True)
     cover = models.ImageField(upload_to='images', blank=True, null=True)

imagersite/imager_images/tests.py

@@ -20,25 +20,24 @@ class Meta:
 class PhotoTests(TestCase):
     """Tests for Photo model."""
 
-    def setUp(self):
-        """Setup for PhotoTests."""
-        someuser = User(username='user1', password='somepassword')
-        someuser.save()
-        some_pro = someuser.profile
-        some_pro.save()
-        album = Album(user=some_pro, title='Some Title')
-        album.save()
-        photo = Photo(user=some_pro, title='Ugly Pics')
-        photo.save()
-
-    def test_user_points_to_profile(self):
-        """Test if user points to a profile."""
-        test_user = User.objects.first()
-        self.assertIsNotNone(test_user.profile)
-
-    # def test_user_has_photo_with_title(self):
-    #     """Test if user has photo attrs."""
+    # @classmethod 1024
+
+    # def setUp(self):
+    #     """Setup for PhotoTests."""
+    #     someuser = User(username='user1', password='somepassword')
+    #     someuser.save()
+    #     some_pro = someuser.profile
+    #     some_pro.save()
+    #     album = Album(user=some_pro, title='Some Title')
+    #     album.save()
+    #     for i in range(10):
+    #         photo = PhotoFactory.build()
+    #         photo.user = some_pro
+    #         photo.save()
+    #         album.photos.add(photo)
+    #     self.album = album
+
+    # def test_user_points_to_profile(self):
+    #     """Test if user points to a profile."""
     #     test_user = User.objects.first()
-    #     test_picture = test_user.profile.photo
-    #     import pdb; pdb.set_trace()
-    #     self.assertEqual(test_picture.title, 'Some Title')
+    #     self.assertIsNotNone(test_user.profile)

imagersite/imager_profile/models.py

@@ -24,6 +24,9 @@ class ImagerProfile(models.Model):
     website = models.URLField(blank=True, null=True)
     location = models.CharField(max_length=100, blank=True, null=True)
     fee = models.FloatField(blank=True, null=True)
+    bio = models.TextField()
+    phone = models.CharField(max_length=100, blank=True, null=True)
+    user = models.OneToOneField(User, on_delete=models.CASCADE, related_name='profile')
     CAMERA_CHOICES = (
         ('CANON', 'Canon'),
         ('NIKON', 'Nikon'),
@@ -43,8 +46,6 @@ class ImagerProfile(models.Model):
         max_length=50,
         choices=SERVICES_CHOICES,
         default='PORTRAIT')
-    bio = models.TextField()
-    phone = models.CharField(max_length=100, blank=True, null=True)
     PHOTO_STYLES = (
         ('BW', 'Black and White'),
         ('Color', 'Color')
@@ -53,7 +54,6 @@ class ImagerProfile(models.Model):
         max_length=50,
         choices=PHOTO_STYLES,
         default='BW')
-    user = models.OneToOneField(User, on_delete=models.CASCADE, related_name='profile')
 
     @property
     def is_active(self):

imagersite/imager_profile/tests.py

@@ -64,55 +64,3 @@ def test_user_is_active(self):
         """Test if profile is active for user."""
         one_user = User.objects.first()
         self.assertEqual(one_user.profile.is_active, True)
-
-
-class Viewtests(TestCase):
-    """Front-end tests using TestCase."""
-
-    def test_home_route_200(self):
-        """Test home route sends 200 response."""
-        c = Client()
-        response = c.get('/')
-        self.assertEqual(response.status_code, 200)
-
-    def test_home_route_has_home_link(self):
-        """Test home route has home link in page."""
-        c = Client()
-        response = c.get('/')
-        self.assertContains(response, '<a href="/">Home</a>')
-
-    def test_login_route_200(self):
-        """Test login route sends 200 response."""
-        c = Client()
-        response = c.get('/login/')
-        self.assertEqual(response.status_code, 200)
-
-    def test_login_returns_login_template(self):
-        """Test login route returns login template."""
-        c = Client()
-        response = c.get('/login/')
-        self.assertEqual(response.template_name, ['registration/login.html'])
-
-    def test_logout_route_200(self):
-        """Test logout route returns 200 response."""
-        c = Client()
-        response = c.get('/logout/')
-        self.assertEqual(response.status_code, 200)
-
-    def test_logout_route_returns_logout_template(self):
-        """Test logout route returns logout template."""
-        c = Client()
-        response = c.get('/logout/')
-        self.assertEqual(response.template_name, ['registration/logged_out.html'])
-
-    def test_register_route_200(self):
-        """Test register route returns 200 response."""
-        c = Client()
-        response = c.get('/accounts/register/')
-        self.assertEqual(response.status_code, 200)
-
-    def test_register_route_returns_register_template(self):
-        """Test register route returns register template."""
-        c = Client()
-        response = c.get('/accounts/register/')
-        self.assertEqual(response.template_name, ['registration/registration_form.html'])

imagersite/imagersite/tests.py

@@ -0,0 +1,58 @@
+"""Test module for imagersite front-end."""
+from django.contrib.auth.models import User
+
+from django.core import mail
+
+from django.test import Client, TestCase
+
+from django.urls import reverse_lazy
+
+from imagersite.views import home_view
+
+
+class Viewtests(TestCase):
+    """Front-end tests using TestCase."""
+
+    def setUp(self):
+        """."""
+        self.cleint = Client()
+
+    def test_home_route_200(self):
+        """Test home route sends 200 response."""
+        response = self.client.get(reverse_lazy('home'))
+        self.assertEqual(response.status_code, 200)
+
+    def test_home_route_has_home_link(self):
+        """Test home route has home link in page."""
+        response = self.client.get(reverse_lazy('home'))
+        self.assertContains(response, '<a href="/">Home</a>')
+
+    def test_login_route_200(self):
+        """Test login route sends 200 response."""
+        response = self.client.get(reverse_lazy('login'))
+        self.assertEqual(response.status_code, 200)
+
+    def test_login_returns_login_template(self):
+        """Test login route returns login template."""
+        response = self.client.get(reverse_lazy('login'))
+        self.assertEqual(response.template_name, ['registration/login.html'])
+
+    def test_logout_route_200(self):
+        """Test logout route returns 200 response."""
+        response = self.client.get(reverse_lazy('logout'))
+        self.assertEqual(response.status_code, 200)
+
+    def test_logout_route_returns_logout_template(self):
+        """Test logout route returns logout template."""
+        response = self.client.get(reverse_lazy('logout'))
+        self.assertEqual(response.template_name, ['registration/logged_out.html'])
+
+    def test_register_route_200(self):
+        """Test register route returns 200 response."""
+        response = self.client.get(reverse_lazy('registration_register'))
+        self.assertEqual(response.status_code, 200)
+
+    def test_register_route_returns_register_template(self):
+        """Test register route returns register template."""
+        response = self.client.get(reverse_lazy('registration_register'))
+        self.assertEqual(response.template_name, ['registration/registration_form.html'])