Merge branch 'master' into feature/merge_master

2016-03-03 16:46:11 -04:00
parent 652613452b 378a346e79
commit ce6a1f4020
24 changed files with 194 additions and 181 deletions
--- a/mayan/apps/ocr/tests/test_api.py
+++ b/mayan/apps/ocr/tests/test_api.py
@@ -71,11 +71,11 @@ class OCRAPITestCase(APITestCase):

        self.assertTrue('Mayan EDMS Documentation' in content)

-    def test_get_document_version_content(self):
+    def test_get_document_version_page_content(self):
        response = self.client.get(
            reverse(
                'rest_api:document-page-content-view',
-                args=(self.document.latest_version.pk,)
+                args=(self.document.latest_version.pages.first().pk,)
            ),
        )