Merge pull request #1 from benadida/master

Merge from benadida master repo

helios/tests.py

@@ -623,8 +623,8 @@ class ElectionBlackboxTests(WebTest):
         check_user_logged_in looks for the "you're already logged" message
         """
         # vote by preparing a ballot via the server-side encryption
-        response = self.app.post("/helios/elections/%s/encrypt-ballot" % election_id, {
-                'answers_json': utils.to_json([[1]])})
+        response = self.app.post("/helios/elections/%s/encrypt-ballot" % election_id,
+                   params={'answers_json': utils.to_json([[1]])})
         self.assertContains(response, "answers")
 
         # parse it as an encrypted vote with randomness, and make sure randomness is there
@@ -637,8 +637,8 @@ class ElectionBlackboxTests(WebTest):
         encrypted_vote = ballot.serialize()
         
         # cast the ballot
-        response = self.app.post("/helios/elections/%s/cast" % election_id, {
-                'encrypted_vote': encrypted_vote})
+        response = self.app.post("/helios/elections/%s/cast" % election_id,
+                   params={'encrypted_vote': encrypted_vote})
         self.assertRedirects(response, "%s/helios/elections/%s/cast_confirm" % (settings.SECURE_URL_HOST, election_id))
 
         cast_confirm_page = response.follow()

requirements.txt

@@ -5,7 +5,7 @@ django-celery==3.1.16
 django-picklefield==0.3.0
 kombu==3.0.30
 html5lib==0.999
-psycopg2==2.6.1
+psycopg2==2.7.3.2
 pyparsing==1.5.7
 python-dateutil>=1.5
 python-openid==2.2.5
@@ -15,7 +15,7 @@ requests==2.7.0
 unicodecsv==0.9.0
 dj_database_url==0.3.0
 django-sslify==0.2.7
-django_webtest==1.7.8
+django_webtest>=1.9
 webtest==2.0.18
 django-secure==1.0.1
 bleach==1.4.1