fixed some tests after icon change

rhodecode/tests/functional/test_home.py

@@ -1,83 +1,83
 import time
 from rhodecode.tests import *
 from rhodecode.tests.fixture import Fixture
 from rhodecode.model.meta import Session
 from rhodecode.model.db import User, Repository
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.repos_group import ReposGroupModel
 
 
 fixture = Fixture()
 
 
 class TestHomeController(TestController):
 
     def test_index(self):
         self.log_user()
         response = self.app.get(url(controller='home', action='index'))
         #if global permission is set
         response.mustcontain('Add repository')
         # html in javascript variable:
         response.mustcontain("""var data = {"totalRecords": %s"""
                              % len(Repository.getAll()))
         response.mustcontain(r'href=\"/%s\"' % HG_REPO)
 
         response.mustcontain(r"""<img class=\"icon\" title=\"Mercurial repository\" """
                         r"""alt=\"Mercurial repository\" src=\"/images/icons/hg"""
                         r"""icon.png\"/>""")
         response.mustcontain(r"""<img class=\"icon\" title=\"Public repository\" """
-                        r"""alt=\"Public repository\" src=\"/images/icons/lock_"""
-                        r"""open.png\"/>""")
+                        r"""alt=\"Public repository\" src=\"/images/icons/public_"""
+                        r"""repo.png\"/>""")
 
         response.mustcontain("""fixes issue with having custom format for git-log""")
         response.mustcontain("""/%s/changeset/5f2c6ee195929b0be80749243c18121c9864a3b3""" % GIT_REPO)
 
         response.mustcontain("""disable security checks on hg clone for travis""")
         response.mustcontain("""/%s/changeset/96507bd11ecc815ebc6270fdf6db110928c09c1e""" % HG_REPO)
 
     def test_repo_summary_with_anonymous_access_disabled(self):
         anon = User.get_default_user()
         anon.active = False
         Session().add(anon)
         Session().commit()
         time.sleep(1.5)  # must sleep for cache (1s to expire)
         try:
             response = self.app.get(url(controller='summary',
                                         action='index', repo_name=HG_REPO),
                                         status=302)
             assert 'login' in response.location
 
         finally:
             anon = User.get_default_user()
             anon.active = True
             Session().add(anon)
             Session().commit()
 
     def test_index_with_anonymous_access_disabled(self):
         anon = User.get_default_user()
         anon.active = False
         Session().add(anon)
         Session().commit()
         time.sleep(1.5)  # must sleep for cache (1s to expire)
         try:
             response = self.app.get(url(controller='home', action='index'),
                                     status=302)
             assert 'login' in response.location
         finally:
             anon = User.get_default_user()
             anon.active = True
             Session().add(anon)
             Session().commit()
 
     def test_index_page_on_groups(self):
         self.log_user()
         gr = fixture.create_group('gr1')
         fixture.create_repo(name='gr1/repo_in_group', repos_group=gr)
         response = self.app.get(url('repos_group_home', group_name='gr1'))
 
         try:
             response.mustcontain("gr1/repo_in_group")
         finally:
             RepoModel().delete('gr1/repo_in_group')
             ReposGroupModel().delete(repos_group='gr1', force_delete=True)
             Session().commit()

rhodecode/tests/functional/test_summary.py

@@ -1,125 +1,125
 from rhodecode.tests import *
 from rhodecode.tests.fixture import Fixture
 from rhodecode.model.db import Repository
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.meta import Session
 from rhodecode.model.scm import ScmModel
 
 fixture = Fixture()
 
 
 class TestSummaryController(TestController):
 
     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))
 
         #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"/>"""
+            """repository" src="/images/icons/public_repo.png"/>"""
         )
 
         #codes stats
         self._enable_stats()
 
         ScmModel().mark_for_invalidation(HG_REPO)
         response = self.app.get(url(controller='summary', action='index',
                                     repo_name=HG_REPO))
         response.mustcontain(
             """var data = [["py", {"count": 68, "desc": ["Python"]}], """
             """["rst", {"count": 16, "desc": ["Rst"]}], """
             """["css", {"count": 2, "desc": ["Css"]}], """
             """["sh", {"count": 2, "desc": ["Bash"]}], """
             """["yml", {"count": 1, "desc": ["Yaml"]}], """
             """["makefile", {"count": 1, "desc": ["Makefile", "Makefile"]}], """
             """["js", {"count": 1, "desc": ["Javascript"]}], """
             """["cfg", {"count": 1, "desc": ["Ini"]}], """
             """["ini", {"count": 1, "desc": ["Ini"]}], """
             """["html", {"count": 1, "desc": ["EvoqueHtml", "Html"]}]];"""
         )
 
         # clone url...
         response.mustcontain('''id="clone_url" readonly="readonly" value="http://test_admin@localhost:80/%s"''' % HG_REPO)
         response.mustcontain('''id="clone_url_id" readonly="readonly" value="http://test_admin@localhost:80/_%s"''' % ID)
 
     def test_index_git(self):
         self.log_user()
         ID = Repository.get_by_repo_name(GIT_REPO).repo_id
         response = self.app.get(url(controller='summary',
                                     action='index',
                                     repo_name=GIT_REPO))
 
         #repo type
         response.mustcontain(
             """<img style="margin-bottom:2px" class="icon" """
             """title="Git repository" alt="Git repository" """
             """src="/images/icons/giticon.png"/>"""
         )
         response.mustcontain(
             """<img style="margin-bottom:2px" class="icon" """
             """title="Public repository" alt="Public """
-            """repository" src="/images/icons/lock_open.png"/>"""
+            """repository" src="/images/icons/public_repo.png"/>"""
         )
 
         # clone url...
         response.mustcontain('''id="clone_url" readonly="readonly" value="http://test_admin@localhost:80/%s"''' % GIT_REPO)
         response.mustcontain('''id="clone_url_id" readonly="readonly" value="http://test_admin@localhost:80/_%s"''' % ID)
 
     def test_index_by_id_hg(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"/>""")
+                        """repository" src="/images/icons/public_repo.png"/>""")
 
     def test_index_by_repo_having_id_path_in_name_hg(self):
         self.log_user()
         fixture.create_repo(name='repo_1')
         response = self.app.get(url(controller='summary',
                                     action='index',
                                     repo_name='repo_1'))
 
         try:
             response.mustcontain("repo_1")
         finally:
             RepoModel().delete(Repository.get_by_repo_name('repo_1'))
             Session().commit()
 
     def test_index_by_id_git(self):
         self.log_user()
         ID = Repository.get_by_repo_name(GIT_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="Git repository" alt="Git """
                         """repository" src="/images/icons/giticon.png"/>""")
         response.mustcontain("""<img style="margin-bottom:2px" class="icon" """
                         """title="Public repository" alt="Public """
-                        """repository" src="/images/icons/lock_open.png"/>""")
+                        """repository" src="/images/icons/public_repo.png"/>""")
 
     def _enable_stats(self):
         r = Repository.get_by_repo_name(HG_REPO)
         r.enable_statistics = True
         Session().add(r)
         Session().commit()