diff --git a/tests/test_progit_flask_ui_repo.py b/tests/test_progit_flask_ui_repo.py index 58dda0c..ed24ad8 100644 --- a/tests/test_progit_flask_ui_repo.py +++ b/tests/test_progit_flask_ui_repo.py @@ -84,8 +84,8 @@ class PagureFlaskRepotests(tests.Modeltests): output = self.app.get('/') self.assertEqual(output.status_code, 200) self.assertIn( - '
test project #1
' in output.data) - self.assertTrue( - 'test project #1
test project #1
' in output.data) - self.assertTrue( - 'test project #1
This repo is brand new!
' in output.data) self.assertFalse('Forked from' in output.data) self.assertTrue('test project #1
' in output.data) - self.assertEqual( - output.data.count(''), 3) # Turn that repo into a fork repo = pagure.lib.get_project(self.session, 'test') @@ -557,8 +549,6 @@ class PagureFlaskRepotests(tests.Modeltests): self.assertFalse('This repo is brand new!
' in output.data) self.assertTrue('test project #1
' in output.data) self.assertTrue('Forked from' in output.data) - self.assertEqual( - output.data.count(''), 3) # Add a fork of a fork item = pagure.lib.model.Project( @@ -584,8 +574,6 @@ class PagureFlaskRepotests(tests.Modeltests): self.assertFalse('This repo is brand new!
' in output.data) self.assertTrue('test project #3
' in output.data) self.assertTrue('Forked from' in output.data) - self.assertEqual( - output.data.count(''), 3) def test_view_repo_empty(self): """ Test the view_repo endpoint on a repo w/o master branch. """ @@ -658,8 +646,6 @@ class PagureFlaskRepotests(tests.Modeltests): self.assertFalse('This repo is brand new!
' in output.data) self.assertFalse('Forked from' in output.data) self.assertTrue('test project #1
' in output.data) - self.assertEqual( - output.data.count(''), 3) # Turn that repo into a fork repo = pagure.lib.get_project(self.session, 'test') @@ -682,8 +668,6 @@ class PagureFlaskRepotests(tests.Modeltests): self.assertFalse('This repo is brand new!
' in output.data) self.assertTrue('test project #1
' in output.data) self.assertTrue('Forked from' in output.data) - self.assertEqual( - output.data.count(''), 3) # Add a fork of a fork item = pagure.lib.model.Project( @@ -709,8 +693,6 @@ class PagureFlaskRepotests(tests.Modeltests): self.assertFalse('This repo is brand new!
' in output.data) self.assertTrue('test project #3
' in output.data) self.assertTrue('Forked from' in output.data) - self.assertEqual( - output.data.count(''), 10) def test_view_commits(self): """ Test the view_commits endpoint. """ @@ -728,8 +710,8 @@ class PagureFlaskRepotests(tests.Modeltests): output = self.app.get('/test/commits') self.assertEqual(output.status_code, 200) - self.assertTrue('This repo is brand new!
' in output.data) - self.assertTrue('test project #1
' in output.data) + self.assertIn('This repo is brand new!
', output.data) + self.assertIn('test project #1
', output.data) # Add some content to the git repo tests.add_content_git_repo(os.path.join(tests.HERE, 'test.git')) @@ -737,19 +719,16 @@ class PagureFlaskRepotests(tests.Modeltests): output = self.app.get('/test/commits') self.assertEqual(output.status_code, 200) - self.assertFalse('This repo is brand new!
' in output.data) - self.assertFalse('Forked from' in output.data) - self.assertTrue('test project #1
' in output.data) - self.assertEqual( - output.data.count(''), 3) + self.assertNotIn('This repo is brand new!
', output.data) + self.assertNotIn('Forked from', output.data) + self.assertIn('test project #1
', output.data) + self.assertIn('This repo is brand new!
' in output.data) - self.assertFalse('Forked from' in output.data) - self.assertTrue('test project #1
' in output.data) - self.assertEqual( - output.data.count(''), 3) + self.assertNotIn('This repo is brand new!
', output.data) + self.assertNotIn('Forked from', output.data) + self.assertIn('test project #1
', output.data) # Turn that repo into a fork repo = pagure.lib.get_project(self.session, 'test') @@ -769,11 +748,9 @@ class PagureFlaskRepotests(tests.Modeltests): output = self.app.get('/fork/pingou/test/commits?page=abc') self.assertEqual(output.status_code, 200) - self.assertFalse('This repo is brand new!
' in output.data) - self.assertTrue('test project #1
' in output.data) - self.assertTrue('Forked from' in output.data) - self.assertEqual( - output.data.count(''), 3) + self.assertNotIn('This repo is brand new!
', output.data) + self.assertIn('test project #1
', output.data) + self.assertIn('Forked from', output.data) # Add a fork of a fork item = pagure.lib.model.Project( @@ -799,11 +776,9 @@ class PagureFlaskRepotests(tests.Modeltests): output = self.app.get('/fork/pingou/test3/commits') self.assertEqual(output.status_code, 200) - self.assertFalse('This repo is brand new!
' in output.data) - self.assertTrue('test project #3
' in output.data) - self.assertTrue('Forked from' in output.data) - self.assertEqual( - output.data.count(''), 13) + self.assertNotIn('This repo is brand new!
', output.data) + self.assertIn('test project #3
', output.data) + self.assertIn('Forked from', output.data) def test_view_file(self): """ Test the view_file endpoint. """ @@ -836,7 +811,7 @@ class PagureFlaskRepotests(tests.Modeltests): # View in a branch output = self.app.get('/test/blob/master/f/sources') self.assertEqual(output.status_code, 200) - self.assertTrue('