From 832b32fb9b44de6cf182cbc724dc8015160ea6a6 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Aug 03 2015 13:29:57 +0000 Subject: Adjust the unit-tests for the new behavior of the doc server --- diff --git a/tests/test_pagure_flask_docs.py b/tests/test_pagure_flask_docs.py index c0767e4..7037358 100644 --- a/tests/test_pagure_flask_docs.py +++ b/tests/test_pagure_flask_docs.py @@ -93,11 +93,7 @@ class PagureFlaskDocstests(tests.Modeltests): tests.create_projects_git(os.path.join(tests.HERE, 'docs')) output = self.app.get('/test/docs') - self.assertEqual(output.status_code, 200) - self.assertTrue('

Docs

' in output.data) - self.assertTrue('

This repo is brand new!

' in output.data) - self.assertTrue( - 'git clone ssh://git@pagure.org/docs/test.git' in output.data) + self.assertEqual(output.status_code, 404) repo.settings = {'project_documentation': False} self.session.add(repo) @@ -113,11 +109,7 @@ class PagureFlaskDocstests(tests.Modeltests): os.path.join(tests.HERE, 'docs', 'test.git'), bare=True) output = self.app.get('/test/docs') - self.assertEqual(output.status_code, 200) - self.assertTrue('

Docs

' in output.data) - self.assertTrue('

This repo is brand new!

' in output.data) - self.assertTrue( - 'git clone ssh://git@pagure.org/docs/test.git' in output.data) + self.assertEqual(output.status_code, 404) # forked doc repo docrepo = os.path.join(tests.HERE, 'docs', 'test', 'test.git') @@ -162,54 +154,33 @@ class PagureFlaskDocstests(tests.Modeltests): # Now check the UI output = self.app.get('/test/docs') - self.assertEqual(output.status_code, 200) - self.assertTrue('

Docs

' in output.data) - self.assertFalse('

This repo is brand new!

' in output.data) - self.assertTrue( - '' in output.data) - self.assertTrue( - '' in output.data) + self.assertEqual(output.status_code, 404) - output = self.app.get('/test/master/sources') + output = self.app.get('/test/sources') self.assertEqual(output.status_code, 200) - self.assertTrue('

Docs

' in output.data) - self.assertTrue('
' in output.data) + self.assertEqual('
foo\n bar
', output.data) - output = self.app.get('/test/master/folder1/folder2') + output = self.app.get('/test/folder1/folder2') self.assertEqual(output.status_code, 200) - self.assertTrue('

Docs

' in output.data) self.assertTrue( - '
  • \n ' - '' + '
  • ' in output.data) - output = self.app.get('/test/master/folder1/folder2/test_file') + output = self.app.get('/test/folder1/folder2/test_file') self.assertEqual(output.status_code, 200) - self.assertTrue('

    Docs

    ' in output.data) - self.assertTrue( - '
    \n
    row1\nrow2\n'
    -            'row3
    \n
    ' in output.data) + self.assertEqual('
    row1\nrow2\nrow3
    ', output.data) - output = self.app.get('/test/master/folder1') + output = self.app.get('/test/folder1') self.assertEqual(output.status_code, 200) - self.assertTrue('

    Docs

    ' in output.data) self.assertTrue( - '
  • \n ' - '' + '
  • ' in output.data) - output = self.app.get('/test/master/folder1/foo') - self.assertEqual(output.status_code, 200) - self.assertTrue('

    Docs

    ' in output.data) - self.assertTrue( - '
  • File folder1/foo not found
  • ' - in output.data) + output = self.app.get('/test/folder1/foo') + self.assertEqual(output.status_code, 404) - output = self.app.get('/test/master/folder1/foo/folder2') - self.assertEqual(output.status_code, 200) - self.assertTrue( - '
  • File folder1/foo/folder2 not found
  • ' - in output.data) + output = self.app.get('/test/folder1/foo/folder2') + self.assertEqual(output.status_code, 404) if __name__ == '__main__':