diff rhodecode/tests/functional/test_summary.py @ 2031:82a88013a3fd

merge 1.3 into stable
author Marcin Kuzminski <marcin@python-works.com>
date Sun, 26 Feb 2012 17:25:09 +0200
parents 8c6d62a8467c b7adbd5456c2
children 63e58ef80ef1
line wrap: on
line diff
--- a/rhodecode/tests/functional/test_summary.py	Sun Feb 19 20:21:14 2012 +0200
+++ b/rhodecode/tests/functional/test_summary.py	Sun Feb 26 17:25:09 2012 +0200
@@ -7,18 +7,22 @@
 
     def test_index(self):
         self.log_user()
+        ID = Repository.get_by_repo_name(HG_REPO).repo_id
         response = self.app.get(url(controller='summary',
-                                    action='index', repo_name=HG_REPO))
+                                    action='index',
+                                    repo_name=HG_REPO))
 
         #repo type
-        self.assertTrue("""<img style="margin-bottom:2px" class="icon" """
-                        """title="Mercurial repository" alt="Mercurial """
-                        """repository" src="/images/icons/hgicon.png"/>"""
-                        in response.body)
-        self.assertTrue("""<img style="margin-bottom:2px" class="icon" """
-                        """title="public repository" alt="public """
-                        """repository" src="/images/icons/lock_open.png"/>"""
-                        in response.body)
+        response.mustcontain(
+            """<img style="margin-bottom:2px" class="icon" """
+            """title="Mercurial repository" alt="Mercurial """
+            """repository" src="/images/icons/hgicon.png"/>"""
+        )
+        response.mustcontain(
+            """<img style="margin-bottom:2px" class="icon" """
+            """title="public repository" alt="public """
+            """repository" src="/images/icons/lock_open.png"/>"""
+        )
 
         #codes stats
         self._enable_stats()
@@ -26,7 +30,6 @@
         invalidate_cache('get_repo_cached_%s' % HG_REPO)
         response = self.app.get(url(controller='summary', action='index',
                                     repo_name=HG_REPO))
-
         response.mustcontain(
             """var data = [["py", {"count": 42, "desc": ["Python"]}], """
             """["rst", {"count": 11, "desc": ["Rst"]}], """
@@ -38,10 +41,26 @@
         )
 
         # clone url...
-        response.mustcontain("""<input type="text" id="clone_url" readonly="readonly" value="hg clone http://test_admin@localhost:80/%s" size="70"/>""" % HG_REPO)
+        response.mustcontain("""<input style="width:80%;margin-left:105px" type="text" id="clone_url" readonly="readonly" value="http://test_admin@localhost:80/vcs_test_hg"/>""")
+        response.mustcontain("""<input style="display:none;width:80%;margin-left:105px" type="text" id="clone_url_id" readonly="readonly" value="http://test_admin@localhost:80/_1"/>""")
+
+    def test_index_by_id(self):
+        self.log_user()
+        ID = Repository.get_by_repo_name(HG_REPO).repo_id
+        response = self.app.get(url(controller='summary',
+                                    action='index',
+                                    repo_name='_%s' % ID))
+
+        #repo type
+        response.mustcontain("""<img style="margin-bottom:2px" class="icon" """
+                        """title="Mercurial repository" alt="Mercurial """
+                        """repository" src="/images/icons/hgicon.png"/>""")
+        response.mustcontain("""<img style="margin-bottom:2px" class="icon" """
+                        """title="public repository" alt="public """
+                        """repository" src="/images/icons/lock_open.png"/>""")
 
     def _enable_stats(self):
         r = Repository.get_by_repo_name(HG_REPO)
         r.enable_statistics = True
-        self.sa.add(r)
-        self.sa.commit()
+        self.Session.add(r)
+        self.Session.commit()