Changeset - b8c657874b7a
Parent rev.
Child rev.
[Not reviewed]
default
0 3 0
Thomas De Schampheleire - 10 years ago 2015-06-20 22:07:56
thomas.de.schampheleire@gmail.com
tests: remove hardcoded reference to HG_REPO
3 files changed with 27 insertions and 27 deletions:
kallithea/tests/functional/test_changeset_comments.py
4
4
kallithea/tests/functional/test_files.py
16
16
kallithea/tests/models/test_permissions.py
7
7
0 comments (0 inline, 0 general)
kallithea/tests/functional/test_changeset_comments.py
➞
Show inline comments
 
@@ -51,14 +51,14 @@ class TestChangeSetCommentsController(Te
 

			




	
	
	
		
 
        notification = Notification.query().all()[0]

			




	
	
	
		
 

			




	
	
	
		
 
        ID = ChangesetComment.query().first().comment_id

			




	
	
	
		
 
        self.assertEqual(notification.type_,

			




	
	
	
		
 
                         Notification.TYPE_CHANGESET_COMMENT)

			




	
	
	
		
 
        sbj = (u'/vcs_test_hg/changeset/'

			




	
	
	
		
 
               '27cd5cce30c96924232dffcd24178a07ffeb5dfc#comment-%s' % ID)

			




	
	
	
		
 
        sbj = (u'/%s/changeset/'

			




	
	
	
		
 
               '27cd5cce30c96924232dffcd24178a07ffeb5dfc#comment-%s' % (HG_REPO, ID))

			




	
	
	
		
 
        print "%s vs %s" % (sbj, notification.subject)

			




	
	
	
		
 
        self.assertTrue(sbj in notification.subject)

			




	
	
	
		
 

			




	
	
	
		
 
    def test_create_inline(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 
        rev = '27cd5cce30c96924232dffcd24178a07ffeb5dfc'

			




	
	
		
 
@@ -92,14 +92,14 @@ class TestChangeSetCommentsController(Te

			




	
	
	
		
 
        self.assertEqual(ChangesetComment.query().count(), 1)

			




	
	
	
		
 

			




	
	
	
		
 
        notification = Notification.query().all()[0]

			




	
	
	
		
 
        ID = ChangesetComment.query().first().comment_id

			




	
	
	
		
 
        self.assertEqual(notification.type_,

			




	
	
	
		
 
                         Notification.TYPE_CHANGESET_COMMENT)

			




	
	
	
		
 
        sbj = (u'/vcs_test_hg/changeset/'

			




	
	
	
		
 
               '27cd5cce30c96924232dffcd24178a07ffeb5dfc#comment-%s' % ID)

			




	
	
	
		
 
        sbj = (u'/%s/changeset/'

			




	
	
	
		
 
               '27cd5cce30c96924232dffcd24178a07ffeb5dfc#comment-%s' % (HG_REPO, ID))

			




	
	
	
		
 
        print "%s vs %s" % (sbj, notification.subject)

			




	
	
	
		
 
        self.assertTrue(sbj in notification.subject)

			




	
	
	
		
 

			




	
	
	
		
 
    def test_create_with_mention(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    kallithea/tests/functional/test_files.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -30,25 +30,25 @@ class TestFilesController(TestController

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 
        response = self.app.get(url(controller='files', action='index',

			




	
	
	
		
 
                                    repo_name=HG_REPO,

			




	
	
	
		
 
                                    revision='tip',

			




	
	
	
		
 
                                    f_path='/'))

			




	
	
	
		
 
        # Test response...

			




	
	
	
		
 
        response.mustcontain('<a class="browser-dir ypjax-link" href="/vcs_test_hg/files/96507bd11ecc815ebc6270fdf6db110928c09c1e/docs"><i class="icon-folder-open"></i><span>docs</span></a>')

			




	
	
	
		
 
        response.mustcontain('<a class="browser-dir ypjax-link" href="/vcs_test_hg/files/96507bd11ecc815ebc6270fdf6db110928c09c1e/vcs"><i class="icon-folder-open"></i><span>vcs</span></a>')

			




	
	
	
		
 
        response.mustcontain('<a class="browser-file ypjax-link" href="/vcs_test_hg/files/96507bd11ecc815ebc6270fdf6db110928c09c1e/.gitignore"><i class="icon-doc"></i><span>.gitignore</span></a>')

			




	
	
	
		
 
        response.mustcontain('<a class="browser-file ypjax-link" href="/vcs_test_hg/files/96507bd11ecc815ebc6270fdf6db110928c09c1e/.hgignore"><i class="icon-doc"></i><span>.hgignore</span></a>')

			




	
	
	
		
 
        response.mustcontain('<a class="browser-file ypjax-link" href="/vcs_test_hg/files/96507bd11ecc815ebc6270fdf6db110928c09c1e/.hgtags"><i class="icon-doc"></i><span>.hgtags</span></a>')

			




	
	
	
		
 
        response.mustcontain('<a class="browser-file ypjax-link" href="/vcs_test_hg/files/96507bd11ecc815ebc6270fdf6db110928c09c1e/.travis.yml"><i class="icon-doc"></i><span>.travis.yml</span></a>')

			




	
	
	
		
 
        response.mustcontain('<a class="browser-file ypjax-link" href="/vcs_test_hg/files/96507bd11ecc815ebc6270fdf6db110928c09c1e/MANIFEST.in"><i class="icon-doc"></i><span>MANIFEST.in</span></a>')

			




	
	
	
		
 
        response.mustcontain('<a class="browser-file ypjax-link" href="/vcs_test_hg/files/96507bd11ecc815ebc6270fdf6db110928c09c1e/README.rst"><i class="icon-doc"></i><span>README.rst</span></a>')

			




	
	
	
		
 
        response.mustcontain('<a class="browser-file ypjax-link" href="/vcs_test_hg/files/96507bd11ecc815ebc6270fdf6db110928c09c1e/run_test_and_report.sh"><i class="icon-doc"></i><span>run_test_and_report.sh</span></a>')

			




	
	
	
		
 
        response.mustcontain('<a class="browser-file ypjax-link" href="/vcs_test_hg/files/96507bd11ecc815ebc6270fdf6db110928c09c1e/setup.cfg"><i class="icon-doc"></i><span>setup.cfg</span></a>')

			




	
	
	
		
 
        response.mustcontain('<a class="browser-file ypjax-link" href="/vcs_test_hg/files/96507bd11ecc815ebc6270fdf6db110928c09c1e/setup.py"><i class="icon-doc"></i><span>setup.py</span></a>')

			




	
	
	
		
 
        response.mustcontain('<a class="browser-file ypjax-link" href="/vcs_test_hg/files/96507bd11ecc815ebc6270fdf6db110928c09c1e/test_and_report.sh"><i class="icon-doc"></i><span>test_and_report.sh</span></a>')

			




	
	
	
		
 
        response.mustcontain('<a class="browser-file ypjax-link" href="/vcs_test_hg/files/96507bd11ecc815ebc6270fdf6db110928c09c1e/tox.ini"><i class="icon-doc"></i><span>tox.ini</span></a>')

			




	
	
	
		
 
        response.mustcontain('<a class="browser-dir ypjax-link" href="/%s/files/96507bd11ecc815ebc6270fdf6db110928c09c1e/docs"><i class="icon-folder-open"></i><span>docs</span></a>' % HG_REPO)

			




	
	
	
		
 
        response.mustcontain('<a class="browser-dir ypjax-link" href="/%s/files/96507bd11ecc815ebc6270fdf6db110928c09c1e/vcs"><i class="icon-folder-open"></i><span>vcs</span></a>' % HG_REPO)

			




	
	
	
		
 
        response.mustcontain('<a class="browser-file ypjax-link" href="/%s/files/96507bd11ecc815ebc6270fdf6db110928c09c1e/.gitignore"><i class="icon-doc"></i><span>.gitignore</span></a>' % HG_REPO)

			




	
	
	
		
 
        response.mustcontain('<a class="browser-file ypjax-link" href="/%s/files/96507bd11ecc815ebc6270fdf6db110928c09c1e/.hgignore"><i class="icon-doc"></i><span>.hgignore</span></a>' % HG_REPO)

			




	
	
	
		
 
        response.mustcontain('<a class="browser-file ypjax-link" href="/%s/files/96507bd11ecc815ebc6270fdf6db110928c09c1e/.hgtags"><i class="icon-doc"></i><span>.hgtags</span></a>' % HG_REPO)

			




	
	
	
		
 
        response.mustcontain('<a class="browser-file ypjax-link" href="/%s/files/96507bd11ecc815ebc6270fdf6db110928c09c1e/.travis.yml"><i class="icon-doc"></i><span>.travis.yml</span></a>' % HG_REPO)

			




	
	
	
		
 
        response.mustcontain('<a class="browser-file ypjax-link" href="/%s/files/96507bd11ecc815ebc6270fdf6db110928c09c1e/MANIFEST.in"><i class="icon-doc"></i><span>MANIFEST.in</span></a>' % HG_REPO)

			




	
	
	
		
 
        response.mustcontain('<a class="browser-file ypjax-link" href="/%s/files/96507bd11ecc815ebc6270fdf6db110928c09c1e/README.rst"><i class="icon-doc"></i><span>README.rst</span></a>' % HG_REPO)

			




	
	
	
		
 
        response.mustcontain('<a class="browser-file ypjax-link" href="/%s/files/96507bd11ecc815ebc6270fdf6db110928c09c1e/run_test_and_report.sh"><i class="icon-doc"></i><span>run_test_and_report.sh</span></a>' % HG_REPO)

			




	
	
	
		
 
        response.mustcontain('<a class="browser-file ypjax-link" href="/%s/files/96507bd11ecc815ebc6270fdf6db110928c09c1e/setup.cfg"><i class="icon-doc"></i><span>setup.cfg</span></a>' % HG_REPO)

			




	
	
	
		
 
        response.mustcontain('<a class="browser-file ypjax-link" href="/%s/files/96507bd11ecc815ebc6270fdf6db110928c09c1e/setup.py"><i class="icon-doc"></i><span>setup.py</span></a>' % HG_REPO)

			




	
	
	
		
 
        response.mustcontain('<a class="browser-file ypjax-link" href="/%s/files/96507bd11ecc815ebc6270fdf6db110928c09c1e/test_and_report.sh"><i class="icon-doc"></i><span>test_and_report.sh</span></a>' % HG_REPO)

			




	
	
	
		
 
        response.mustcontain('<a class="browser-file ypjax-link" href="/%s/files/96507bd11ecc815ebc6270fdf6db110928c09c1e/tox.ini"><i class="icon-doc"></i><span>tox.ini</span></a>' % HG_REPO)

			




	
	
	
		
 

			




	
	
	
		
 
    def test_index_revision(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 

			




	
	
	
		
 
        response = self.app.get(

			




	
	
	
		
 
            url(controller='files', action='index',

			




	
	
		
 
@@ -56,15 +56,15 @@ class TestFilesController(TestController

			




	
	
	
		
 
                revision='7ba66bec8d6dbba14a2155be32408c435c5f4492',

			




	
	
	
		
 
                f_path='/')

			




	
	
	
		
 
        )

			




	
	
	
		
 

			




	
	
	
		
 
        #Test response...

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain('<a class="browser-dir ypjax-link" href="/vcs_test_hg/files/7ba66bec8d6dbba14a2155be32408c435c5f4492/docs"><i class="icon-folder-open"></i><span>docs</span></a>')

			




	
	
	
		
 
        response.mustcontain('<a class="browser-dir ypjax-link" href="/vcs_test_hg/files/7ba66bec8d6dbba14a2155be32408c435c5f4492/tests"><i class="icon-folder-open"></i><span>tests</span></a>')

			




	
	
	
		
 
        response.mustcontain('<a class="browser-file ypjax-link" href="/vcs_test_hg/files/7ba66bec8d6dbba14a2155be32408c435c5f4492/README.rst"><i class="icon-doc"></i><span>README.rst</span></a>')

			




	
	
	
		
 
        response.mustcontain('<a class="browser-dir ypjax-link" href="/%s/files/7ba66bec8d6dbba14a2155be32408c435c5f4492/docs"><i class="icon-folder-open"></i><span>docs</span></a>' % HG_REPO)

			




	
	
	
		
 
        response.mustcontain('<a class="browser-dir ypjax-link" href="/%s/files/7ba66bec8d6dbba14a2155be32408c435c5f4492/tests"><i class="icon-folder-open"></i><span>tests</span></a>' % HG_REPO)

			




	
	
	
		
 
        response.mustcontain('<a class="browser-file ypjax-link" href="/%s/files/7ba66bec8d6dbba14a2155be32408c435c5f4492/README.rst"><i class="icon-doc"></i><span>README.rst</span></a>' % HG_REPO)

			




	
	
	
		
 
        response.mustcontain('1.1 KiB')

			




	
	
	
		
 

			




	
	
	
		
 
    def test_index_different_branch(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 

			




	
	
	
		
 
        response = self.app.get(url(controller='files', action='index',

			




        

    


    
    

    

        

                

                    kallithea/tests/models/test_permissions.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -67,13 +67,13 @@ class TestPermissions(BaseTestCase):

			




	
	
	
		
 
    def test_default_perms_set(self):

			




	
	
	
		
 
        u1_auth = AuthUser(user_id=self.u1.user_id)

			




	
	
	
		
 
        perms = {

			




	
	
	
		
 
            'repositories_groups': {},

			




	
	
	
		
 
            'global': set([u'hg.create.repository', u'repository.read',

			




	
	
	
		
 
                           u'hg.register.manual_activate']),

			




	
	
	
		
 
            'repositories': {u'vcs_test_hg': u'repository.read'}

			




	
	
	
		
 
            'repositories': {HG_REPO: u'repository.read'}

			




	
	
	
		
 
        }

			




	
	
	
		
 
        self.assertEqual(u1_auth.permissions['repositories'][HG_REPO],

			




	
	
	
		
 
                         perms['repositories'][HG_REPO])

			




	
	
	
		
 
        new_perm = 'repository.write'

			




	
	
	
		
 
        RepoModel().grant_user_permission(repo=HG_REPO, user=self.u1,

			




	
	
	
		
 
                                          perm=new_perm)

			




	
	
		
 
@@ -85,13 +85,13 @@ class TestPermissions(BaseTestCase):

			




	
	
	
		
 

			




	
	
	
		
 
    def test_default_admin_perms_set(self):

			




	
	
	
		
 
        a1_auth = AuthUser(user_id=self.a1.user_id)

			




	
	
	
		
 
        perms = {

			




	
	
	
		
 
            'repositories_groups': {},

			




	
	
	
		
 
            'global': set([u'hg.admin', 'hg.create.write_on_repogroup.true']),

			




	
	
	
		
 
            'repositories': {u'vcs_test_hg': u'repository.admin'}

			




	
	
	
		
 
            'repositories': {HG_REPO: u'repository.admin'}

			




	
	
	
		
 
        }

			




	
	
	
		
 
        self.assertEqual(a1_auth.permissions['repositories'][HG_REPO],

			




	
	
	
		
 
                         perms['repositories'][HG_REPO])

			




	
	
	
		
 
        new_perm = 'repository.write'

			




	
	
	
		
 
        RepoModel().grant_user_permission(repo=HG_REPO, user=self.a1,

			




	
	
	
		
 
                                          perm=new_perm)

			




	
	
		
 
@@ -106,13 +106,13 @@ class TestPermissions(BaseTestCase):

			




	
	
	
		
 
        self.g1 = fixture.create_repo_group('test1', skip_if_exists=True)

			




	
	
	
		
 
        self.g2 = fixture.create_repo_group('test2', skip_if_exists=True)

			




	
	
	
		
 
        u1_auth = AuthUser(user_id=self.u1.user_id)

			




	
	
	
		
 
        perms = {

			




	
	
	
		
 
            'repositories_groups': {u'test1': 'group.read', u'test2': 'group.read'},

			




	
	
	
		
 
            'global': set(Permission.DEFAULT_USER_PERMISSIONS),

			




	
	
	
		
 
            'repositories': {u'vcs_test_hg': u'repository.read'}

			




	
	
	
		
 
            'repositories': {HG_REPO: u'repository.read'}

			




	
	
	
		
 
        }

			




	
	
	
		
 
        self.assertEqual(u1_auth.permissions['repositories'][HG_REPO],

			




	
	
	
		
 
                         perms['repositories'][HG_REPO])

			




	
	
	
		
 
        self.assertEqual(u1_auth.permissions['repositories_groups'],

			




	
	
	
		
 
                         perms['repositories_groups'])

			




	
	
	
		
 
        self.assertEqual(u1_auth.permissions['global'],

			




	
	
		
 
@@ -122,13 +122,13 @@ class TestPermissions(BaseTestCase):

			




	
	
	
		
 
        self.g1 = fixture.create_repo_group('test1', skip_if_exists=True)

			




	
	
	
		
 
        self.g2 = fixture.create_repo_group('test2', skip_if_exists=True)

			




	
	
	
		
 
        a1_auth = AuthUser(user_id=self.a1.user_id)

			




	
	
	
		
 
        perms = {

			




	
	
	
		
 
            'repositories_groups': {u'test1': 'group.admin', u'test2': 'group.admin'},

			




	
	
	
		
 
            'global': set(['hg.admin', 'hg.create.write_on_repogroup.true']),

			




	
	
	
		
 
            'repositories': {u'vcs_test_hg': 'repository.admin'}

			




	
	
	
		
 
            'repositories': {HG_REPO: 'repository.admin'}

			




	
	
	
		
 
        }

			




	
	
	
		
 

			




	
	
	
		
 
        self.assertEqual(a1_auth.permissions['repositories'][HG_REPO],

			




	
	
	
		
 
                         perms['repositories'][HG_REPO])

			




	
	
	
		
 
        self.assertEqual(a1_auth.permissions['repositories_groups'],

			




	
	
	
		
 
                         perms['repositories_groups'])

			




	
	
		
 
@@ -155,13 +155,13 @@ class TestPermissions(BaseTestCase):

			




	
	
	
		
 
        # check perms

			




	
	
	
		
 
        u1_auth = AuthUser(user_id=self.u1.user_id)

			




	
	
	
		
 
        perms = {

			




	
	
	
		
 
            'repositories_groups': {},

			




	
	
	
		
 
            'global': set([u'hg.create.repository', u'repository.read',

			




	
	
	
		
 
                           u'hg.register.manual_activate']),

			




	
	
	
		
 
            'repositories': {u'vcs_test_hg': u'repository.read'}

			




	
	
	
		
 
            'repositories': {HG_REPO: u'repository.read'}

			




	
	
	
		
 
        }

			




	
	
	
		
 
        self.assertEqual(u1_auth.permissions['repositories'][HG_REPO],

			




	
	
	
		
 
                         new_perm)

			




	
	
	
		
 
        self.assertEqual(u1_auth.permissions['repositories_groups'],

			




	
	
	
		
 
                         perms['repositories_groups'])

			




	
	
	
		
 

			




	
	
		
 
@@ -178,13 +178,13 @@ class TestPermissions(BaseTestCase):

			




	
	
	
		
 
        # check perms

			




	
	
	
		
 
        u3_auth = AuthUser(user_id=self.u3.user_id)

			




	
	
	
		
 
        perms = {

			




	
	
	
		
 
            'repositories_groups': {},

			




	
	
	
		
 
            'global': set([u'hg.create.repository', u'repository.read',

			




	
	
	
		
 
                           u'hg.register.manual_activate']),

			




	
	
	
		
 
            'repositories': {u'vcs_test_hg': u'repository.read'}

			




	
	
	
		
 
            'repositories': {HG_REPO: u'repository.read'}

			




	
	
	
		
 
        }

			




	
	
	
		
 
        self.assertEqual(u3_auth.permissions['repositories'][HG_REPO],

			




	
	
	
		
 
                         new_perm_gr)

			




	
	
	
		
 
        self.assertEqual(u3_auth.permissions['repositories_groups'],

			




	
	
	
		
 
                         perms['repositories_groups'])

			




	
	
	
		
 

			




	
	
		
 
@@ -212,13 +212,13 @@ class TestPermissions(BaseTestCase):

			




	
	
	
		
 
        # check perms

			




	
	
	
		
 
        u1_auth = AuthUser(user_id=self.u1.user_id)

			




	
	
	
		
 
        perms = {

			




	
	
	
		
 
            'repositories_groups': {},

			




	
	
	
		
 
            'global': set([u'hg.create.repository', u'repository.read',

			




	
	
	
		
 
                           u'hg.register.manual_activate']),

			




	
	
	
		
 
            'repositories': {u'vcs_test_hg': u'repository.write'}

			




	
	
	
		
 
            'repositories': {HG_REPO: u'repository.write'}

			




	
	
	
		
 
        }

			




	
	
	
		
 
        self.assertEqual(u1_auth.permissions['repositories'][HG_REPO],

			




	
	
	
		
 
                         new_perm_h)

			




	
	
	
		
 
        self.assertEqual(u1_auth.permissions['repositories_groups'],

			




	
	
	
		
 
                         perms['repositories_groups'])

			




	
	
	
		
 

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.