Changed PDT tests to use test_urls. Fixed signals as per mthornhill's…

… branch.

standard/pdt/models.py

@@ -7,8 +7,8 @@
 from django.http import QueryDict
 from django.utils.http import urlencode
 from paypal.standard.models import PayPalStandardBase
-from signals import pdt_successful, pdt_failed
 from paypal.standard.conf import POSTBACK_ENDPOINT, SANDBOX_POSTBACK_ENDPOINT
+from paypal.standard.pdt.signals import pdt_successful, pdt_failed
 
 # ### Todo: Move this logic to conf.py:
 # if paypal.standard.pdt is in installed apps

standard/pdt/signals.py

@@ -7,19 +7,19 @@
 from django.dispatch import Signal
 
 # Sent when a payment is successfully processed.
-payment_was_successful = Signal()
+pdt_successful = Signal()
 
 # Sent when a payment is flagged.
-payment_was_flagged = Signal()
+pdt_failed = Signal()
 
-# Sent when a subscription was cancelled.
-subscription_cancel = Signal()
-
-# Sent when a subscription expires.
-subscription_eot = Signal()
-
-# Sent when a subscription was modified.
-subscription_modify = Signal()
-
-# Sent when a subscription ends.
-subscription_signup = Signal()
+# # Sent when a subscription was cancelled.
+# subscription_cancel = Signal()
+# 
+# # Sent when a subscription expires.
+# subscription_eot = Signal()
+# 
+# # Sent when a subscription was modified.
+# subscription_modify = Signal()
+# 
+# # Sent when a subscription ends.
+# subscription_signup = Signal()

standard/pdt/tests/__init__.py

@@ -1 +1 @@
-from pdt import *
+from test_pdt import *

standard/pdt/tests/templates/pdt/pdt.html

@@ -0,0 +1,19 @@
+{% ifequal pdt_obj.st 'SUCCESS' %}
+<h1>Transaction complete</h1>
+<p>Thank you for your payment</p>
+<p>Please print this page for your records</p>
+
+<div>	
+	<table>
+	<tr><td>Payer:</td><td>{{ pdt_obj.first_name }} {{ pdt_obj.last_name }} </td></tr>
+	<tr><td>Payer Email:</td><td>{{ pdt_obj.payer_email }}</td></tr>	
+	<tr><td>Amount:</td><td>{{ pdt_obj.mc_currency }} {{ pdt_obj.mc_gross }}</td></tr>		
+	<tr><td>Reference:</td><td>{{ pdt_obj.txn_id }}</td></tr>
+
+	</table>
+</div>
+
+{% else %}	
+<h1>Transaction Failed</h1>
+<p>Sorry transaction failed, please try a different form of payment</p>	
+{% endifequal %}		

standard/pdt/tests/test_pdt.py

@@ -0,0 +1,123 @@
+"""
+run this with ./manage.py test website
+see http://www.djangoproject.com/documentation/testing/ for details
+"""
+import os
+from django.conf import settings
+from django.shortcuts import render_to_response
+from django.test import TestCase
+from paypal.standard.pdt.forms import PayPalPDTForm
+from paypal.standard.pdt.models import PayPalPDT
+from paypal.standard.pdt.signals import pdt_successful, pdt_failed
+
+
+class DummyPayPalPDT(object):
+
+    def __init__(self, update_context_dict={}):
+        self.context_dict = {'st': 'SUCCESS', 'custom':'cb736658-3aad-4694-956f-d0aeade80194',
+                             'txn_id':'1ED550410S3402306', 'mc_gross': '225.00', 
+                             'business': settings.PAYPAL_RECEIVER_EMAIL, 'error': 'Error code: 1234'}
+
+        self.context_dict.update(update_context_dict)
+
+    def update_with_get_params(self, get_params):
+        if get_params.has_key('tx'):
+            self.context_dict['txn_id'] = get_params.get('tx')
+        if get_params.has_key('amt'):
+            self.context_dict['mc_gross'] = get_params.get('amt')
+        if get_params.has_key('cm'):
+            self.context_dict['custom'] = get_params.get('cm')
+
+    def _postback(self, test=True):
+        """Perform a Fake PayPal PDT Postback request."""
+        # @@@ would be cool if this could live in the test templates dir...
+        return render_to_response("pdt/test_pdt_response.html", self.context_dict)
+
+class PDTTest(TestCase):
+    urls = "paypal.standard.pdt.tests.test_urls"
+    template_dirs = [os.path.join(os.path.dirname(__file__), 'templates'),]
+
+    def setUp(self):
+        # set up some dummy PDT get parameters
+        self.get_params = {"tx":"4WJ86550014687441", "st":"Completed", "amt":"225.00", "cc":"EUR",
+                      "cm":"a3e192b8-8fea-4a86-b2e8-d5bf502e36be", "item_number":"",
+                      "sig":"blahblahblah"}
+
+        # monkey patch the PayPalPDT._postback function
+        self.dpppdt = DummyPayPalPDT()
+        self.dpppdt.update_with_get_params(self.get_params)
+        PayPalPDT._postback = self.dpppdt._postback
+
+    def test_parse_paypal_response(self):
+        dpppdt = DummyPayPalPDT()
+        paypal_response = dpppdt._postback()
+        assert('SUCCESS' in paypal_response)
+        self.assertEqual(len(PayPalPDT.objects.all()), 0)
+        pdt_obj = PayPalPDT()
+        pdt_obj.ipaddress = '127.0.0.1'
+        pdt_obj._parse_paypal_response(paypal_response)
+        self.assertEqual(len(PayPalPDT.objects.all()), 0)
+        self.assertEqual(pdt_obj.txn_id, '1ED550410S3402306')
+
+    def test_pdt(self):        
+        self.assertEqual(len(PayPalPDT.objects.all()), 0)        
+        self.dpppdt.update_with_get_params(self.get_params)
+        paypal_response = self.client.get("/pdt/", self.get_params)
+
+        print paypal_response
+
+        self.assertContains(paypal_response, 'Transaction complete', status_code=200)
+        self.assertEqual(len(PayPalPDT.objects.all()), 1)
+
+#     def test_pdt_signals(self):
+#         self.successful_pdt_fired = False        
+#         self.failed_pdt_fired = False
+#         
+#         def successful_pdt(sender, **kwargs):
+#             self.successful_pdt_fired = True
+#         pdt_successful.connect(successful_pdt)
+#             
+#         def failed_pdt(sender, **kwargs):
+#             self.failed_pdt_fired = True 
+#         pdt_failed.connect(failed_pdt)
+#         
+#         self.assertEqual(len(PayPalPDT.objects.all()), 0)        
+#         paypal_response = self.client.get("/pdt/", self.get_params)
+#         self.assertContains(paypal_response, 'Transaction complete', status_code=200)        
+#         self.assertEqual(len(PayPalPDT.objects.all()), 1)
+#         self.assertTrue(self.successful_pdt_fired)
+#         self.assertFalse(self.failed_pdt_fired)        
+#         pdt_obj = PayPalPDT.objects.all()[0]
+#         self.assertEqual(pdt_obj.flag, False)
+#         
+#     def test_double_pdt_get(self):
+#         self.assertEqual(len(PayPalPDT.objects.all()), 0)            
+#         paypal_response = self.client.get("/pdt/", self.get_params)
+#         self.assertContains(paypal_response, 'Transaction complete', status_code=200)
+#         self.assertEqual(len(PayPalPDT.objects.all()), 1)
+#         pdt_obj = PayPalPDT.objects.all()[0]        
+#         self.assertEqual(pdt_obj.flag, False)        
+#         paypal_response = self.client.get("/pdt/", self.get_params)
+#         self.assertContains(paypal_response, 'Transaction complete', status_code=200)
+#         self.assertEqual(len(PayPalPDT.objects.all()), 1) # we don't create a new pdt        
+#         pdt_obj = PayPalPDT.objects.all()[0]
+#         self.assertEqual(pdt_obj.flag, False)
+# 
+#     def test_no_txn_id_in_pdt(self):
+#         self.dpppdt.context_dict.pop('txn_id')
+#         self.get_params={}
+#         paypal_response = self.client.get("/pdt/", self.get_params)
+#         self.assertContains(paypal_response, 'Transaction Failed', status_code=200)
+#         self.assertEqual(len(PayPalPDT.objects.all()), 0)
+#         
+#     def test_custom_passthrough(self):
+#         self.assertEqual(len(PayPalPDT.objects.all()), 0)        
+#         self.dpppdt.update_with_get_params(self.get_params)
+#         paypal_response = self.client.get("/pdt/", self.get_params)
+#         
+#         print paypal_response.template
+#         
+#         self.assertContains(paypal_response, 'Transaction complete', status_code=200)
+#         self.assertEqual(len(PayPalPDT.objects.all()), 1)
+#         pdt_obj = PayPalPDT.objects.all()[0]
+#         self.assertEqual(pdt_obj.custom, self.get_params['cm'] )

standard/pdt/tests/test_urls.py

@@ -0,0 +1,5 @@
+from django.conf.urls.defaults import *
+
+urlpatterns = patterns('paypal.standard.pdt.views',
+    (r'^pdt/$', 'pdt'),
+)

standard/pdt/views.py

@@ -5,24 +5,24 @@
 from django.views.decorators.http import require_GET
 from paypal.standard.pdt.models import PayPalPDT
 from paypal.standard.pdt.forms import PayPalPDTForm
-
-
+ 
+ 
 @require_GET
 def pdt(request, item_check_callable=None, template="pdt/pdt.html", context=None):
     """Payment data transfer implementation: http://tinyurl.com/c9jjmw"""
     context = context or {}
     pdt_obj = None
     txn_id = request.GET.get('tx')
-    if txn_id is not None:        
+    failed = False
+    if txn_id is not None:
         # If an existing transaction with the id tx exists: use it
         try:
-            pdt_obj = PayPalPDT.objects.get(txn_id=txn_id)        
+            pdt_obj = PayPalPDT.objects.get(txn_id=txn_id)
         except PayPalPDT.DoesNotExist:
             # This is a new transaction so we continue processing PDT request
             pass
 
         if pdt_obj is None:
-            failed = False
             form = PayPalPDTForm(request.GET)
             if form.is_valid():
                 try:
@@ -38,16 +38,13 @@ def pdt(request, item_check_callable=None, template="pdt/pdt.html", context=None
                 pdt_obj = PayPalPDT()
                 pdt_obj.set_flag("Invalid form. %s" % error)
 
-            pdt_obj.init(request)
+            pdt_obj.initialize(request)
 
             if not failed:
                 # The PDT object gets saved during verify
-                if pdt_obj.test_ipn:
-                    pdt_obj.verify(item_check_callable)
-                else:
-                    pdt_obj.verify(item_check_callable, test=False)
+                pdt_obj.verify(item_check_callable)
     else:
-        pass # we ignore any PDT requests that don't have a transaction id    
+        pass # we ignore any PDT requests that don't have a transaction id
 
-    context.update({"failed":failed, "pdt_obj":pdt_obj})          
-    return render_to_response(template, context, RequestContext(request))
+    context.update({"failed":failed, "pdt_obj":pdt_obj})
+    return render_to_response(template, context, RequestContext(request))