Fixed review tests to work with refactored code

oscar/apps/product/reviews/abstract_models.py

@@ -75,6 +75,10 @@ class AbstractProductReview(models.Model):
     def save(self, *args, **kwargs):
         if not self.user and not (self.name and self.email):  
             raise ValidationError("Anonymous review must have a name and an email")
+        if not self.title:
+            raise ValidationError("Reviews must have a title")
+        if self.score is None:
+            raise ValidationError("Reviews must have a score")
         super(AbstractProductReview, self).save(*args, **kwargs)
 
     def has_votes(self):

oscar/apps/product/reviews/fixtures/sample-reviews.json

@@ -7,8 +7,8 @@
             "product": 1, 
             "name": "", 
             "title": "Test review 1", 
-            "url": "", 
-            "approved": true, 
+            "homepage": "", 
+            "status": 1, 
             "score": "4", 
             "user": 1, 
             "date_created": "2011-05-19 18:00:48", 
@@ -25,8 +25,8 @@
             "product": 1, 
             "name": "Anon2", 
             "title": "Anon review 2", 
-            "url": "", 
-            "approved": true, 
+            "homepage": "", 
+            "status": 1, 
             "score": "3", 
             "user": null, 
             "date_created": "2011-05-20 10:51:54", 
@@ -43,8 +43,8 @@
             "product": 1, 
             "name": "Anon1", 
             "title": "another review", 
-            "url": "", 
-            "approved": true, 
+            "homepage": "", 
+            "status": 1, 
             "score": "5", 
             "user": null, 
             "date_created": "2011-05-20 10:10:46", 

oscar/apps/product/reviews/tests.py

@@ -1,5 +1,6 @@
 from random import randint
 from sys import maxint
+
 from django.test import TestCase, Client
 from django.core.exceptions import ValidationError
 from django.contrib.auth.models import User, AnonymousUser
@@ -7,8 +8,8 @@ from django.db import IntegrityError
 from django.core.urlresolvers import reverse
 from django.utils import unittest
 
-from oscar.apps.product.models import Item, ItemClass
-from oscar.apps.reviews.models import ProductReview, Vote
+from oscar.apps.product.reviews.models import ProductReview, Vote
+from oscar.test.helpers import create_product
 
 
 class ProductReviewTests(unittest.TestCase):
@@ -19,43 +20,33 @@ class ProductReviewTests(unittest.TestCase):
         username = str(randint(0, maxint))
         self.user = User.objects.create_user(username, '%s@users.com'%username, '%spass123'%username)
         self.anon_user = AnonymousUser()
-        self.item_class,_ = ItemClass.objects.get_or_create(name='Books')
-        self.item,_ = Item.objects.get_or_create(title='Django Book v2', item_class=self.item_class)
-        self.review,_ = ProductReview.objects.get_or_create(title='Django Book v2 Review',\
-                            product=self.item, user=self.user, score=3, approved=True)
-
+        self.item = create_product()
+        self.review = ProductReview.objects.create(product=self.item,
+                                                   title="Dummy review",
+                                                   score=3,
+                                                   user=self.user)
 
-class TopLevelProductReviewTests(ProductReviewTests):
-    u"""
-    Basic tests for ProductReview model
-    """
     def test_top_level_reviews_must_have_titles_and_scores(self):
-        self.assertRaises(ValidationError, ProductReview.objects.create, product=self.item,\
-                           user=self.user)
+        self.assertRaises(ValidationError, ProductReview.objects.create, product=self.item,
+                          user=self.user)
 
     def test_top_level_anonymous_reviews_must_have_names_and_emails(self):
-        self.assertRaises(ValidationError, ProductReview.objects.create, product=self.item,\
-                           user=None, title="Anonymous review", score=3)
+        self.assertRaises(ValidationError, ProductReview.objects.create, product=self.item,
+                          user=None, title="Anonymous review", score=3)
 
 
 class TopLevelProductReviewVoteTests(ProductReviewTests):
-    u"""
+    """
     Basic tests for Vote model
     """
-    def setUp(self):
-        super(TopLevelProductReviewVoteTests, self).setUp()
-
-    def test_top_level_vote_must_have_choice(self):
-        self.assertRaises(ValidationError, Vote.objects.create, review=self.review,\
-                           user=self.user)
 
     def test_try_vote_without_login(self):
-        self.assertRaises(ValueError, Vote.objects.create, review=self.review, choice =-1, user=self.anon_user)
+        self.assertRaises(ValueError, Vote.objects.create, review=self.review, delta=-1, user=self.anon_user)
 
     def test_try_vote_more_than_once(self):
-        vote1 = Vote.objects.create(review=self.review, user=self.user, choice=1)
+        vote1 = Vote.objects.create(review=self.review, user=self.user, delta=1)
         self.assertTrue(vote1)
-        self.assertRaises(IntegrityError, Vote.objects.create, review=self.review, choice=-1, user=self.user)
+        self.assertRaises(IntegrityError, Vote.objects.create, review=self.review, delta=-1, user=self.user)
 
 
 class SingleProductReviewViewTest(ProductReviewTests, TestCase):
@@ -87,63 +78,4 @@ class SingleProductReviewViewTest(ProductReviewTests, TestCase):
         response = self.client.get(url)
         self.assertContains(response, 'name')
         self.assertContains(response, 'email')
-        
-    def test_each_review_has_own_page(self):  # FIXME: broken for reverse
-        self.kwargs['review_id'] = self.review.id
-        url = reverse('oscar-product-review', kwargs = self.kwargs)
-        response = self.client.get(url)
-        self.assertEquals(200, response.status_code)
-
-
-class SingleProductReviewVoteViewTest(ProductReviewTests, TestCase):
-    u"""
-    Each product review can be voted up or down
-    """
-    def setUp(self):
-        self.client = Client()
-        super(SingleProductReviewVoteViewTest, self).setUp()   
-        self.kwargs = {'item_class_slug': self.item.get_item_class().slug, 
-                'item_slug': self.item.slug,
-                'item_id': self.item.id,
-                'review_id': self.review.id}
-        
-    def test_vote_up_product_review(self):
-        url = reverse('oscar-vote-review', kwargs=self.kwargs)
-        self.client.login(username='testuser', password='secret')
-        response = self.client.get(url)
-        self.assertEquals(200, response.status_code)
-    
 
-class ProductReviewVotingActionTests(TestCase):
-    u"""
-    Includes the behaviour tests after voting on a review
-    """
-    fixtures = ['sample-product', 'sample-reviews']    
-    
-    def setUp(self):
-        # get reviews
-        self.reviews = ProductReview.objects.all()       
-        # dummy voters
-        self.voters = 10        
-        self.users = []
-        for i in xrange(self.voters):
-            u = User.objects.create_user('user%d'%i, 'user%d@users.com'%i, 'userpass%d'%i)
-            self.users.append(u)        
-    
-    def test_upvote_can_boost_up_review(self):
-        # get a review
-        old_rank = 1
-        self.assertTrue(self.reviews)
-        self.review = self.reviews[old_rank]        
-        review_id = self.review.id
-        old_votes = self.review.total_votes
-        # vote up
-        for i in xrange(self.voters):
-            vote = Vote.objects.create(review=self.review, user=self.users[i], choice=1)
-            self.assertTrue(vote)
-        # test vote count
-        self.failUnlessEqual(self.review.total_votes, (self.voters + old_votes))
-        # test rank
-        reviews = ProductReview.top_voted.all()
-        new_rank = list(reviews.values_list('id', flat=True)).index(review_id)
-        self.failUnless(new_rank < old_rank)