Switch functional tests to use WebTest

oscar/templates/oscar/dashboard/offers/offer_detail.html

@@ -62,7 +62,7 @@
             <tr>
                 <th>{% trans "Name" %}</th>
                 <td>{{ offer.name }}</td>
-                <td rowspan="2"><a href="{% url dashboard:offer-metadata offer.pk %}" class="btn">Edit</a></td>
+                <td rowspan="2"><a id="edit_metadata" href="{% url dashboard:offer-metadata offer.pk %}" class="btn">Edit</a></td>
             </tr>
             <tr>
                 <th>{% trans "Description" %}</th>

tests/functional/dashboard/offer_tests.py

@@ -1,100 +1,106 @@
-import datetime
-
 from django.core.urlresolvers import reverse
-from django.test import TestCase
-
-from oscar_testsupport.testcases import ClientTestCase
-from oscar.apps.offer.models import Range, ConditionalOffer, Condition, Benefit
-from oscar.apps.dashboard.offers.forms import MetaDataForm
-
-
-class ViewTests(ClientTestCase):
-    is_staff = True
-
-    def test_pages_exist(self):
-        urls = [reverse('dashboard:offer-list'),
-                reverse('dashboard:offer-metadata'),
-               ]
-        for url in urls:
-            self.assertIsOk(self.client.get(url))
-
-
-class MetadataFormTests(TestCase):
+from oscar_testsupport import testcases, factories
 
-    def test_dates_must_be_cronological(self):
-        start_date = datetime.date(2012, 1, 1)
-        end_date = datetime.date(2011, 1, 1)
-        post = {'name': 'dummy',
-                'description': 'dummy',
-                'start_date': start_date,
-                'end_date': end_date,}
-        form = MetaDataForm(post)
-        self.assertFalse(form.is_valid())
+from oscar.apps.offer import models
 
 
-class OfferUpdatingTests(ClientTestCase):
+class TestAnAdmin(testcases.WebTestCase):
+    # New version of offer tests buy using WebTest
     is_staff = True
 
     def setUp(self):
-        super(OfferUpdatingTests, self).setUp()
-        self.range = Range.objects.create(name='All products',
-                                          includes_all_products=True)
-        condition = Condition.objects.create(range=self.range,
-                                             type='Count',
-                                             value=3)
-        benefit = Benefit.objects.create(range=self.range,
-                                         type='Multibuy',
-                                         value=1)
-
-        start_date = datetime.date(2012, 1, 1)
-        end_date = datetime.date(2013, 1, 1)
-        self.offer = ConditionalOffer.objects.create(name='my offer',
-                                                     description='something',
-                                                     start_date=start_date,
-                                                     end_date=end_date,
-                                                     condition=condition,
-                                                     benefit=benefit)
-
-    def tearDown(self):
-        ConditionalOffer.objects.all().delete()
-
-    def test_happy_path(self):
-        metadata_url = reverse('dashboard:offer-metadata', kwargs={'pk': self.offer.id})
-        response = self.client.get(metadata_url)
-        self.assertTrue('my offer' in response.content)
-
-        response = self.client.post(metadata_url,
-                                    {'name': 'my new offer',
-                                     'description': 'something',
-                                     'start_date': '2012-01-01',
-                                     'end_date': '2013-01-01'})
-        self.assertIsRedirect(response)
-
-        condition_url = reverse('dashboard:offer-condition', kwargs={'pk': self.offer.id})
-        response = self.client.post(condition_url,
-                                    {'range': self.range.id,
-                                     'type': 'Count',
-                                     'value': '3',})
-        self.assertIsRedirect(response)
-
-        benefit_url = reverse('dashboard:offer-benefit', kwargs={'pk': self.offer.id})
-        response = self.client.post(benefit_url,
-                                    {'range': self.range.id,
-                                     'type': 'Multibuy',
-                                     'value': '',})
-        self.assertIsRedirect(response)
-
-        preview_url = reverse('dashboard:offer-preview', kwargs={'pk': self.offer.id})
-        response = self.client.get(preview_url)
-        self.assertTrue('my new offer' in response.content)
-
-        response = self.client.post(preview_url)
-        self.assertIsRedirect(response)
-
-        offer = ConditionalOffer.objects.get(id=self.offer.id)
-        self.assertEqual('my new offer', offer.name)
-
-    def test_can_jump_to_condition_step(self):
-        response = self.client.get(reverse('dashboard:offer-condition',
-                                           kwargs={'pk': self.offer.id}))
-        self.assertIsOk(response)
+        super(TestAnAdmin, self).setUp()
+        self.range = models.Range.objects.create(
+            name="All products", includes_all_products=True)
+
+    def test_can_create_an_offer(self):
+        list_page = self.get(reverse('dashboard:offer-list'))
+
+        metadata_page = list_page.click('Create new offer')
+        metadata_form = metadata_page.form
+        metadata_form['name'] = "Test offer"
+        metadata_form['start_date'] = "2012-01-01"
+        metadata_form['end_date'] = "2014-01-01"
+
+        condition_page = metadata_form.submit().follow()
+        condition_form = condition_page.form
+        condition_form['range'] = self.range.id
+        condition_form['type'] = "Count"
+        condition_form['value'] = "3"
+
+        benefit_page = condition_form.submit().follow()
+        benefit_form = benefit_page.form
+        benefit_form['range'] = self.range.id
+        benefit_form['type'] = "Percentage"
+        benefit_form['value'] = "25"
+
+        preview_page = benefit_form.submit().follow()
+        preview_page.form.submit()
+
+        offers = models.ConditionalOffer.objects.all()
+        self.assertEqual(1, len(offers))
+        offer = offers[0]
+        self.assertEqual("Test offer", offer.name)
+        self.assertEqual(3, offer.condition.value)
+        self.assertEqual(25, offer.benefit.value)
+
+    def test_can_update_an_existing_offer(self):
+        factories.create_offer(name="Offer A")
+
+        list_page = self.get(reverse('dashboard:offer-list'))
+        detail_page = list_page.click('Offer A')
+
+        metadata_page = detail_page.click(linkid="edit_metadata")
+        metadata_form = metadata_page.form
+        metadata_form['name'] = "Offer A+"
+
+        condition_page = metadata_form.submit().follow()
+        condition_form = condition_page.form
+
+        benefit_page = condition_form.submit().follow()
+        benefit_form = benefit_page.form
+
+        preview_page = benefit_form.submit().follow()
+        preview_page.form.submit()
+
+        models.ConditionalOffer.objects.get(name="Offer A+")
+
+    def test_can_jump_to_intermediate_step_for_existing_offer(self):
+        offer = factories.create_offer()
+        url = reverse('dashboard:offer-condition',
+                      kwargs={'pk': offer.id})
+        self.assertEqual(200, self.get(url).status_code)
+
+    def test_cannot_jump_to_intermediate_step(self):
+        for url_name in ('dashboard:offer-condition',
+                         'dashboard:offer-benefit',
+                         'dashboard:offer-preview'):
+            response = self.get(reverse(url_name))
+            self.assertEqual(302, response.status_code)
+
+    def test_can_suspend_an_offer(self):
+        # Create an offer
+        offer = factories.create_offer()
+        self.assertFalse(offer.is_suspended)
+
+        detail_page = self.get(reverse('dashboard:offer-detail',
+                                       kwargs={'pk': offer.pk}))
+        form = detail_page.forms['status_form']
+        form.submit('suspend')
+
+        reloaded_offer = models.ConditionalOffer.objects.get(pk=offer.pk)
+        self.assertTrue(reloaded_offer.is_suspended)
+
+    def test_can_reinstate_a_suspended_offer(self):
+        # Create a suspended offer
+        offer = factories.create_offer()
+        offer.suspend()
+        self.assertTrue(offer.is_suspended)
+
+        detail_page = self.get(reverse('dashboard:offer-detail',
+                                       kwargs={'pk': offer.pk}))
+        form = detail_page.forms['status_form']
+        form.submit('unsuspend')
+
+        reloaded_offer = models.ConditionalOffer.objects.get(pk=offer.pk)
+        self.assertFalse(reloaded_offer.is_suspended)

tests/functional/dashboard/offer_tests2.py

@@ -1,79 +0,0 @@
-from django.core.urlresolvers import reverse
-from oscar_testsupport import testcases, factories
-
-from oscar.apps.offer import models
-
-
-class TestAnAdmin(testcases.WebTestCase):
-    # New version of offer tests buy using WebTest
-    is_staff = True
-
-    def setUp(self):
-        super(TestAnAdmin, self).setUp()
-        self.range = models.Range.objects.create(
-            name="All products", includes_all_products=True)
-
-    def test_can_create_an_offer(self):
-        list_page = self.get(reverse('dashboard:offer-list'))
-
-        metadata_page = list_page.click('Create new offer')
-        metadata_form = metadata_page.form
-        metadata_form['name'] = "Test offer"
-        metadata_form['start_date'] = "2012-01-01"
-        metadata_form['end_date'] = "2014-01-01"
-
-        condition_page = metadata_form.submit().follow()
-        condition_form = condition_page.form
-        condition_form['range'] = self.range.id
-        condition_form['type'] = "Count"
-        condition_form['value'] = "3"
-
-        benefit_page = condition_form.submit().follow()
-        benefit_form = benefit_page.form
-        benefit_form['range'] = self.range.id
-        benefit_form['type'] = "Percentage"
-        benefit_form['value'] = "25"
-
-        preview_page = benefit_form.submit().follow()
-        preview_page.form.submit()
-
-        offers = models.ConditionalOffer.objects.all()
-        self.assertEqual(1, len(offers))
-        offer = offers[0]
-        self.assertEqual("Test offer", offer.name)
-        self.assertEqual(3, offer.condition.value)
-        self.assertEqual(25, offer.benefit.value)
-
-    def test_cannot_jump_to_intermediate_step(self):
-        for url_name in ('dashboard:offer-condition',
-                         'dashboard:offer-benefit',
-                         'dashboard:offer-preview'):
-            response = self.get(reverse(url_name))
-            self.assertEqual(302, response.status_code)
-
-    def test_can_suspend_an_offer(self):
-        # Create an offer
-        offer = factories.create_offer()
-        self.assertFalse(offer.is_suspended)
-
-        detail_page = self.get(reverse('dashboard:offer-detail',
-                                       kwargs={'pk': offer.pk}))
-        form = detail_page.forms['status_form']
-        form.submit('suspend')
-
-        reloaded_offer = models.ConditionalOffer.objects.get(pk=offer.pk)
-        self.assertTrue(reloaded_offer.is_suspended)
-
-    def test_can_reinstate_a_suspended_offer(self):
-        # Create a suspended offer
-        offer = factories.create_offer()
-        offer.suspend()
-        self.assertTrue(offer.is_suspended)
-
-        detail_page = self.get(reverse('dashboard:offer-detail',
-                                       kwargs={'pk': offer.pk}))
-        form = detail_page.forms['status_form']
-        form.submit('unsuspend')
-
-        reloaded_offer = models.ConditionalOffer.objects.get(pk=offer.pk)
-        self.assertFalse(reloaded_offer.is_suspended)

tests/unit/offer/form_tests.py

@@ -0,0 +1,18 @@
+import datetime
+
+from django.test import TestCase
+
+from oscar.apps.dashboard.offers.forms import MetaDataForm
+
+
+class TestMetadataFormEnforces(TestCase):
+
+    def test_cronological_dates(self):
+        start_date = datetime.date(2012, 1, 1)
+        end_date = datetime.date(2011, 1, 1)
+        post = {'name': 'dummy',
+                'description': 'dummy',
+                'start_date': start_date,
+                'end_date': end_date}
+        form = MetaDataForm(post)
+        self.assertFalse(form.is_valid())