kallithea Changeset - 5d8cda8e63dc

Changeset - 5d8cda8e63dc

Parent rev.

Child rev.

[Not reviewed]

beta

0 1 0

Marcin Kuzminski - 13 years ago 2013-03-28 03:29:38
marcin@python-works.com

fixed login tests

1 file changed with 7 insertions and 8 deletions:

rhodecode/tests/functional/test_login.py

0 comments (0 inline, 0 general)

rhodecode/tests/functional/test_login.py

➞

Show inline comments

@@ @@ -26,37 +26,36 @@ class TestLoginController(TestController @@
                                  {'username': 'test_admin',
                                   'password': 'test12'})
         self.assertEqual(response.status, '302 Found')
         self.assertEqual(response.session['rhodecode_user'].get('username'),
                          'test_admin')
         response = response.follow()
-        self.assertTrue('%s repository' % HG_REPO in response.body)
+        response.mustcontain('/%s' % HG_REPO)
     def test_login_regular_ok(self):
         response = self.app.post(url(controller='login', action='index'),
                                  {'username': 'test_regular',
                                   'password': 'test12'})
         self.assertEqual(response.status, '302 Found')
         self.assertEqual(response.session['rhodecode_user'].get('username'),
                          'test_regular')
         response = response.follow()
         self.assertTrue('%s repository' % HG_REPO in response.body)
         self.assertTrue('<a title="Admin" href="/_admin">' not in response.body)
         response.mustcontain('/%s' % HG_REPO)
     def test_login_ok_came_from(self):
         test_came_from = '/_admin/users'
         response = self.app.post(url(controller='login', action='index',
                                      came_from=test_came_from),
                                  {'username': 'test_admin',
                                   'password': 'test12'})
         self.assertEqual(response.status, '302 Found')
         response = response.follow()
         self.assertEqual(response.status, '200 OK')
-        self.assertTrue('Users administration' in response.body)
+        response.mustcontain('Users administration')
     @parameterized.expand([
           ('data:text/html,<script>window.alert("xss")</script>',),
           ('mailto:test@rhodecode.org',),
           ('file:///etc/passwd',),
           ('ftp://some.ftp.server',),
@@ @@ -77,28 +76,28 @@ class TestLoginController(TestController @@
     def test_login_short_password(self):
         response = self.app.post(url(controller='login', action='index'),
                                  {'username': 'test_admin',
                                   'password': 'as'})
         self.assertEqual(response.status, '200 OK')
-        self.assertTrue('Enter 3 characters or more' in response.body)
+        response.mustcontain('Enter 3 characters or more')
     def test_login_wrong_username_password(self):
         response = self.app.post(url(controller='login', action='index'),
                                  {'username': 'error',
                                   'password': 'test12'})
         self.assertTrue('invalid user name' in response.body)
         self.assertTrue('invalid password' in response.body)
         response.mustcontain('invalid user name')
         response.mustcontain('invalid password')
     #==========================================================================
     # REGISTRATIONS
     #==========================================================================
     def test_register(self):
         response = self.app.get(url(controller='login', action='register'))
-        self.assertTrue('Sign Up to RhodeCode' in response.body)
+        response.mustcontain('Sign Up to RhodeCode')
     def test_register_err_same_username(self):
         uname = 'test_admin'
         response = self.app.post(url(controller='login', action='register'),
                                             {'username': uname,
                                              'password': 'test12',

0 comments (0 inline, 0 general)