kallithea Changeset - 5ca2a5e96793

Changeset - 5ca2a5e96793

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 14 years ago 2011-11-21 02:26:48
marcin@python-works.com

fixed tests

2 files changed with 18 insertions and 13 deletions:

rhodecode/tests/functional/test_files.py

rhodecode/tests/test_models.py

0 comments (0 inline, 0 general)

rhodecode/tests/functional/test_files.py

➞

Show inline comments

 from rhodecode.tests import *
 ARCHIVE_SPECS = {
     '.tar.bz2': ('application/x-bzip2', 'tbz2', ''),
     '.tar.gz': ('application/x-gzip', 'tgz', ''),
     '.zip': ('application/zip', 'zip', ''),
+}
 class TestFilesController(TestController):
     def test_index(self):
         self.log_user()
         response = self.app.get(url(controller='files', action='index',
                                     repo_name=HG_REPO,
                                     revision='tip',
                                     f_path='/'))
         # Test response...
         assert '<a class="browser-dir" href="/vcs_test_hg/files/27cd5cce30c96924232dffcd24178a07ffeb5dfc/docs">docs</a>' in response.body, 'missing dir'
         assert '<a class="browser-dir" href="/vcs_test_hg/files/27cd5cce30c96924232dffcd24178a07ffeb5dfc/tests">tests</a>' in response.body, 'missing dir'
         assert '<a class="browser-dir" href="/vcs_test_hg/files/27cd5cce30c96924232dffcd24178a07ffeb5dfc/vcs">vcs</a>' in response.body, 'missing dir'
         assert '<a class="browser-file" href="/vcs_test_hg/files/27cd5cce30c96924232dffcd24178a07ffeb5dfc/.hgignore">.hgignore</a>' in response.body, 'missing file'
         assert '<a class="browser-file" href="/vcs_test_hg/files/27cd5cce30c96924232dffcd24178a07ffeb5dfc/MANIFEST.in">MANIFEST.in</a>' in response.body, 'missing file'
         assert '<a class="browser-dir ypjax-link" href="/vcs_test_hg/files/27cd5cce30c96924232dffcd24178a07ffeb5dfc/docs">docs</a>' in response.body, 'missing dir'
         assert '<a class="browser-dir ypjax-link" href="/vcs_test_hg/files/27cd5cce30c96924232dffcd24178a07ffeb5dfc/tests">tests</a>' in response.body, 'missing dir'
         assert '<a class="browser-dir ypjax-link" href="/vcs_test_hg/files/27cd5cce30c96924232dffcd24178a07ffeb5dfc/vcs">vcs</a>' in response.body, 'missing dir'
         assert '<a class="browser-file ypjax-link" href="/vcs_test_hg/files/27cd5cce30c96924232dffcd24178a07ffeb5dfc/.hgignore">.hgignore</a>' in response.body, 'missing file'
         assert '<a class="browser-file ypjax-link" href="/vcs_test_hg/files/27cd5cce30c96924232dffcd24178a07ffeb5dfc/MANIFEST.in">MANIFEST.in</a>' in response.body, 'missing file'
     def test_index_revision(self):
         self.log_user()
         response = self.app.get(url(controller='files', action='index',
                                     repo_name=HG_REPO,
                                     revision='7ba66bec8d6dbba14a2155be32408c435c5f4492',
                                     f_path='/'))
         #Test response...
         assert '<a class="browser-dir" href="/vcs_test_hg/files/7ba66bec8d6dbba14a2155be32408c435c5f4492/docs">docs</a>' in response.body, 'missing dir'
         assert '<a class="browser-dir" href="/vcs_test_hg/files/7ba66bec8d6dbba14a2155be32408c435c5f4492/tests">tests</a>' in response.body, 'missing dir'
         assert '<a class="browser-file" href="/vcs_test_hg/files/7ba66bec8d6dbba14a2155be32408c435c5f4492/README.rst">README.rst</a>' in response.body, 'missing file'
         assert '<a class="browser-dir ypjax-link" href="/vcs_test_hg/files/7ba66bec8d6dbba14a2155be32408c435c5f4492/docs">docs</a>' in response.body, 'missing dir'
         assert '<a class="browser-dir ypjax-link" href="/vcs_test_hg/files/7ba66bec8d6dbba14a2155be32408c435c5f4492/tests">tests</a>' in response.body, 'missing dir'
         assert '<a class="browser-file ypjax-link" href="/vcs_test_hg/files/7ba66bec8d6dbba14a2155be32408c435c5f4492/README.rst">README.rst</a>' in response.body, 'missing file'
         assert '1.1 KiB' in response.body, 'missing size of setup.py'
         assert 'text/x-python' in response.body, 'missing mimetype of setup.py'
     def test_index_different_branch(self):
         self.log_user()
         response = self.app.get(url(controller='files', action='index',
                                     repo_name=HG_REPO,
                                     revision='97e8b885c04894463c51898e14387d80c30ed1ee',
                                     f_path='/'))
         assert """<span style="text-transform: uppercase;"><a href="#">branch: git</a></span>""" in response.body, 'missing or wrong branch info'
     def test_index_paging(self):
         self.log_user()
         for r in [(73, 'a066b25d5df7016b45a41b7e2a78c33b57adc235'),
                   (92, 'cc66b61b8455b264a7a8a2d8ddc80fcfc58c221e'),

rhodecode/tests/test_models.py

➞

Show inline comments

@@ @@ -154,63 +154,68 @@ class TestReposGroups(unittest.TestCase) @@
         # test repo
         self.assertEqual(r.repo_name, os.path.join('g2', 'g1', r.just_name))
 class TestNotifications(unittest.TestCase):
     def setUp(self):
         self.u1 = UserModel().create_or_update(username='u1', password='qweqwe',
                                                email='u1@rhodecode.org',
                                                name='u1', lastname='u1')
         self.u2 = UserModel().create_or_update(username='u2', password='qweqwe',
                                                email='u2@rhodecode.org',
                                                name='u2', lastname='u3')
         self.u3 = UserModel().create_or_update(username='u3', password='qweqwe',
                                                email='u3@rhodecode.org',
                                                name='u3', lastname='u3')
     def test_create_notification(self):
         usrs = [self.u1, self.u2]
         notification = Notification.create(subject='subj', body='hi there',
         notification = Notification.create(created_by=self.u1,
                                            subject='subj', body='hi there',
                             recipients=usrs)
         notifications = Session.query(Notification).all()
         unotification = UserNotification.query()\
             .filter(UserNotification.notification == notification).all()
         self.assertEqual(len(notifications), 1)
         self.assertEqual(notifications[0].recipients, [self.u1, self.u2])
         self.assertEqual(notification, notifications[0])
         self.assertEqual(notification.notification_id,
                          notifications[0].notification_id)
         self.assertEqual(len(unotification), len(usrs))
         self.assertEqual([x.user.user_id for x in unotification],
                          [x.user_id for x in usrs])
     def test_user_notifications(self):
         notification1 = Notification.create(subject='subj', body='hi there',
         notification1 = Notification.create(created_by=self.u1,
                                             subject='subj', body='hi there',
                             recipients=[self.u3])
         notification2 = Notification.create(subject='subj', body='hi there',
         notification2 = Notification.create(created_by=self.u1,
                                             subject='subj', body='hi there',
                             recipients=[self.u3])
         self.assertEqual(self.u3.notifications, [notification1, notification2])
     def test_delete_notifications(self):
         notification = Notification.create(subject='title', body='hi there3',
         notification = Notification.create(created_by=self.u1,
                                            subject='title', body='hi there3',
                             recipients=[self.u3, self.u1, self.u2])
         notifications = Notification.query().all()
         self.assertTrue(notification in notifications)
         Notification.delete(notification.notification_id)
         notifications = Notification.query().all()
         self.assertFalse(notification in notifications)
         un = UserNotification.query().filter(UserNotification.notification
                                              == notification).all()
         self.assertEqual(un, [])
     def tearDown(self):
         User.delete(self.u1.user_id)
         User.delete(self.u2.user_id)
         User.delete(self.u3.user_id)

0 comments (0 inline, 0 general)