tests update

rhodecode/controllers/journal.py

@@ -1,97 +1,98
 # -*- coding: utf-8 -*-
 """
     rhodecode.controllers.journal
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     Journal controller for pylons
     
     :created_on: Nov 21, 2010
     :author: marcink
     :copyright: (C) 2009-2010 Marcin Kuzminski <[e-mail]>    
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
 # 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 
 import logging
 from sqlalchemy import or_
 
 from pylons import request, response, session, tmpl_context as c, url
 
 from rhodecode.lib.auth import LoginRequired, NotAnonymous
 from rhodecode.lib.base import BaseController, render
 from rhodecode.lib.helpers import get_token
 from rhodecode.model.db import UserLog, UserFollowing
 from rhodecode.model.scm import ScmModel
 
 from paste.httpexceptions import HTTPInternalServerError
 
 log = logging.getLogger(__name__)
 
 class JournalController(BaseController):
 
 
     @LoginRequired()
     @NotAnonymous()
     def __before__(self):
         super(JournalController, self).__before__()
 
     def index(self):
         # Return a rendered template
 
         c.following = self.sa.query(UserFollowing)\
             .filter(UserFollowing.user_id == c.rhodecode_user.user_id).all()
 
         repo_ids = [x.follows_repository.repo_id for x in c.following
                     if x.follows_repository is not None]
         user_ids = [x.follows_user.user_id for x in c.following
                     if x.follows_user is not None]
 
         c.journal = self.sa.query(UserLog)\
             .filter(or_(
                         UserLog.repository_id.in_(repo_ids),
                         UserLog.user_id.in_(user_ids),
                         ))\
             .order_by(UserLog.action_date.desc())\
             .limit(20)\
             .all()
         return render('/journal.html')
 
     def toggle_following(self):
-
-        if request.POST.get('auth_token') == get_token():
+        cur_token = request.POST.get('auth_token')
+        token = get_token()
+        if cur_token == token:
             scm_model = ScmModel()
 
             user_id = request.POST.get('follows_user_id')
             if user_id:
                 try:
                     scm_model.toggle_following_user(user_id,
                                                     c.rhodecode_user.user_id)
                     return 'ok'
                 except:
                     raise HTTPInternalServerError()
 
             repo_id = request.POST.get('follows_repo_id')
             if repo_id:
                 try:
                     scm_model.toggle_following_repo(repo_id,
                                                     c.rhodecode_user.user_id)
                     return 'ok'
                 except:
                     raise HTTPInternalServerError()
 
 
-
+        log.debug('token mismatch %s vs %s', cur_token, token)
         raise HTTPInternalServerError()

rhodecode/tests/functional/test_home.py

@@ -1,11 +1,15
 from rhodecode.tests import *
 
 class TestHomeController(TestController):
 
     def test_index(self):
         self.log_user()
         response = self.app.get(url(controller='home', action='index'))
         #if global permission is set
-        assert 'ADD NEW REPOSITORY' in response.body, 'Wrong main page'
+        assert 'ADD NEW REPOSITORY' in response.body, 'No Button for add new repository'
         assert 'href="/%s/summary"' % HG_REPO in response.body, ' mising repository in list'
         # Test response...
+
+        assert """<img class="icon" title="Mercurial repository" alt="Mercurial repository" src="/images/icons/hgicon.png"/>""" in response.body, 'wrong info about type of repositry'
+        assert """<img class="icon" title="public repository" alt="public repository" src="/images/icons/lock_open.png"/>""" in response.body, 'wrong info about repository availabilty'
+        assert """<a class="tooltip" href="/vcs_test_hg/changeset/27cd5cce30c96924232dffcd24178a07ffeb5dfc" tooltip_title="merge">r173:27cd5cce30c9</a>""" in response.body, 'no info about tooltip'

rhodecode/tests/functional/test_journal.py

@@ -1,7 +1,47
 from rhodecode.tests import *
+from rhodecode.model.db import UserFollowing, User, Repository
+from rhodecode.lib.helpers import get_token
 
 class TestJournalController(TestController):
 
     def test_index(self):
+        self.log_user()
         response = self.app.get(url(controller='journal', action='index'))
         # Test response...
+        assert """<div class="currently_following">
+                    
+                    
+                        <img class="icon" title="public repository" alt="public repository" src="/images/icons/lock_open.png"/>
+                      
+                      <a href="/vcs_test_hg/summary">vcs_test_hg</a>
+                      
+                </div>""" in response.body, 'following repo list'
+
+
+
+    def test_stop_following_repository(self):
+        session = self.log_user()
+#        usr = self.sa.query(User).filter(User.username == 'test_admin').one()
+#        repo = self.sa.query(Repository).filter(Repository.repo_name == HG_REPO).one()
+#
+#        followings = self.sa.query(UserFollowing)\
+#            .filter(UserFollowing.user == usr)\
+#            .filter(UserFollowing.follows_repository == repo).all()
+#
+#        assert len(followings) == 1, 'Not following any repository'
+#
+#        response = self.app.post(url(controller='journal',
+#                                     action='toggle_following'),
+#                                     {'auth_token':get_token(session),
+#                                      'follows_repo_id':repo.repo_id})
+
+    def test_start_following_repository(self):
+        self.log_user()
+        response = self.app.get(url(controller='journal', action='index'),)
+
+
+    def __add_repo(self):
+        pass
+
+    def __remove_repo(self):
+        pass