From 7f78a9b16d5561a04e07d9274d82567802922a39 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Mar 15 2016 14:51:08 +0000 Subject: [PATCH 1/2] Turn off the project's documentation by default This will impact new projects but not the existing ones and will prevent a `Doc` tab leading to nothing if there is no doc. --- diff --git a/pagure/lib/model.py b/pagure/lib/model.py index c51170f..50fd549 100644 --- a/pagure/lib/model.py +++ b/pagure/lib/model.py @@ -340,7 +340,7 @@ class Project(BASE): """ default = { 'issue_tracker': True, - 'project_documentation': True, + 'project_documentation': False, 'pull_requests': True, 'Only_assignee_can_merge_pull-request': False, 'Minimum_score_to_merge_pull-request': -1, From e994c4675f0b4c1151091c3f814cc1ae0bb78129 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Mar 15 2016 14:51:08 +0000 Subject: [PATCH 2/2] Adjust the unit-tests for having the project's docs off by default --- diff --git a/tests/test_pagure_flask_docs.py b/tests/test_pagure_flask_docs.py index 7037358..e537def 100644 --- a/tests/test_pagure_flask_docs.py +++ b/tests/test_pagure_flask_docs.py @@ -74,6 +74,12 @@ class PagureFlaskDocstests(tests.Modeltests): """ tests.create_projects(self.session) + # Turn on the docs project since it's off by default + repo = pagure.lib.get_project(self.session, 'test') + repo.settings = {'project_documentation': True} + self.session.add(repo) + self.session.commit() + output = self.app.get('/test/docs', follow_redirects=True) self.assertEqual(output.status_code, 404) self.assertTrue( @@ -151,6 +157,12 @@ class PagureFlaskDocstests(tests.Modeltests): PagureRepo.push(remote, 'refs/heads/master:refs/heads/master') + # Turn on the docs project since it's off by default + repo = pagure.lib.get_project(self.session, 'test') + repo.settings = {'project_documentation': True} + self.session.add(repo) + self.session.commit() + # Now check the UI output = self.app.get('/test/docs') diff --git a/tests/test_pagure_lib.py b/tests/test_pagure_lib.py index 327db04..0f8d576 100644 --- a/tests/test_pagure_lib.py +++ b/tests/test_pagure_lib.py @@ -874,14 +874,14 @@ class PagureLibtests(tests.Modeltests): # Before repo = pagure.lib.get_project(self.session, 'test2') self.assertTrue(repo.settings['issue_tracker']) - self.assertTrue(repo.settings['project_documentation']) + self.assertFalse(repo.settings['project_documentation']) msg = pagure.lib.update_project_settings( session=self.session, repo=repo, settings={ 'issue_tracker': True, - 'project_documentation': True, + 'project_documentation': False, 'pull_requests': True, 'Only_assignee_can_merge_pull-request': False, 'Minimum_score_to_merge_pull-request': -1, @@ -898,7 +898,7 @@ class PagureLibtests(tests.Modeltests): repo=repo, settings={ 'issue_tracker': False, - 'project_documentation': False, + 'project_documentation': True, 'pull_requests': False, 'Only_assignee_can_merge_pull-request': None, 'Minimum_score_to_merge_pull-request': None, @@ -912,7 +912,7 @@ class PagureLibtests(tests.Modeltests): # After repo = pagure.lib.get_project(self.session, 'test2') self.assertFalse(repo.settings['issue_tracker']) - self.assertFalse(repo.settings['project_documentation']) + self.assertTrue(repo.settings['project_documentation']) self.assertFalse(repo.settings['pull_requests']) def test_search_projects(self): diff --git a/tests/test_pagure_lib_git.py b/tests/test_pagure_lib_git.py index d29890d..d3d7e31 100644 --- a/tests/test_pagure_lib_git.py +++ b/tests/test_pagure_lib_git.py @@ -717,7 +717,7 @@ index 0000000..60f7480 + "Web-hooks": null, + "always_merge": false, + "issue_tracker": true, -+ "project_documentation": true, ++ "project_documentation": false, + "pull_requests": true + }, + "tags": [], @@ -745,7 +745,7 @@ index 0000000..60f7480 + "Web-hooks": null, + "always_merge": false, + "issue_tracker": true, -+ "project_documentation": true, ++ "project_documentation": false, + "pull_requests": true + }, + "tags": [],