diff --git a/NEWS b/NEWS index e32d544..d4392c7 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,5 @@ 1.5.13: January ??, 2009 - * Fixed various bugs related to online subscription processing. + * Fixed various bugs related to the subscription page. 1.5.12: December 30, 2008 * Fixed a bug in which clicking on the notebook rename text field ended the diff --git a/controller/test/Test_controller.py b/controller/test/Test_controller.py index 0158a18..02e7897 100644 --- a/controller/test/Test_controller.py +++ b/controller/test/Test_controller.py @@ -80,8 +80,8 @@ class Test_controller( object ): u"included_users": 1, u"fee": 1.99, u"yearly_fee": 19.90, - u"button": u"[subscribe here user %s!] button", - u"yearly_button": u"[yearly subscribe here user %s!] button", + u"button": u"[subscribe here user %s!] button (modify=%s)", + u"yearly_button": u"[yearly subscribe here user %s!] button (modify=%s)", }, { u"name": "extra super", @@ -91,8 +91,8 @@ class Test_controller( object ): u"included_users": 3, u"fee": 9.00, u"yearly_fee": 90.00, - u"button": u"[or here user %s!] button", - u"yearly_button": u"[yearly or here user %s!] button", + u"button": u"[or here user %s!] button (modify=%s)", + u"yearly_button": u"[yearly or here user %s!] button (modify=%s)", }, ], "luminotes.download_products": [ diff --git a/controller/test/Test_users.py b/controller/test/Test_users.py index b5f900a..9496390 100644 --- a/controller/test/Test_users.py +++ b/controller/test/Test_users.py @@ -542,7 +542,7 @@ class Test_users( Test_controller ): form = result.get( u"form" ) plan = self.settings[ u"global" ][ u"luminotes.rate_plans" ][ 1 ] - assert form == plan[ u"button" ] % self.user.object_id + assert form == plan[ u"button" ] % ( self.user.object_id, 0 ) def test_subscribe_yearly( self ): self.login() @@ -555,7 +555,7 @@ class Test_users( Test_controller ): form = result.get( u"form" ) plan = self.settings[ u"global" ][ u"luminotes.rate_plans" ][ 1 ] - assert form == plan[ u"yearly_button" ] % self.user.object_id + assert form == plan[ u"yearly_button" ] % ( self.user.object_id, 0 ) def test_subscribe_with_free_rate_plan( self ): self.login() @@ -4999,7 +4999,7 @@ class Test_users( Test_controller ): assert result[ u"notes" ][ 0 ].title == u"thank you" assert result[ u"notes" ][ 0 ].notebook_id == self.anon_notebook.object_id assert u"Thank you" in result[ u"notes" ][ 0 ].contents - assert u"confirmation" in result[ u"notes" ][ 0 ].contents + assert u"confirmation" not in result[ u"notes" ][ 0 ].contents def test_thanks_download( self ): access_id = u"wheeaccessid"