Merge master into bitbucket

2015-04-30 15:52:08 -04:00 · 2015-04-30 15:52:08 -04:00 · b96e35b28c
commit b96e35b28c
parent b3675df667 ded28f6b30
44 changed files with 695 additions and 110 deletions
--- a/test/test_api_usage.py
+++ b/test/test_api_usage.py
@ -308,6 +308,16 @@ class TestConvertToOrganization(ApiTestCase):

    self.assertEqual('The admin user is not valid', json['message'])

+  def test_sameadminuser_by_email(self):
+    self.login(READ_ACCESS_USER)
+    json = self.postJsonResponse(ConvertToOrganization,
+                                 data={'adminUser': 'no1@thanks.com',
+                                       'adminPassword': 'password',
+                                       'plan': 'free'},
+                                 expected_code=400)
+
+    self.assertEqual('The admin user is not valid', json['message'])
+
  def test_invalidadminuser(self):
    self.login(READ_ACCESS_USER)
    json = self.postJsonResponse(ConvertToOrganization,