Skip to content

Commit

Permalink
Merge 04241aa into c1a438d
Browse files Browse the repository at this point in the history
  • Loading branch information
@sunew
sunew committed Jun 26, 2018
2 parents c1a438d + 04241aa commit 4cb5fa0
Show file tree
Hide file tree
Showing 11 changed files with 42 additions and 40 deletions.
4 changes: 2 additions & 2 deletions src/plone/restapi/tests/robot/test.robot
View file
Expand Up @@ -13,10 +13,10 @@ ${BROWSER} = firefox

Plone site
[Tags] start
Go to http://localhost:55001/plone/
Go to ${PLONE_URL}
Page should contain Plone site

*** Keywords ***

Start browser
Open browser http://localhost:55001/plone/ browser=${BROWSER}
Open browser ${PLONE_URL} browser=${BROWSER}
2 changes: 1 addition & 1 deletion src/plone/restapi/tests/test_batching.py
View file
Expand Up @@ -268,7 +268,7 @@ def test_contains_canonical_url(self):
# Response should contain canonical URL without batching params
self.assertEqual(
response.json()['@id'],
u'http://localhost:55001/plone/')
self.portal_url + u'/')

def test_contains_batching_links(self):
# Fetch the second page of the batch
Expand Down
5 changes: 3 additions & 2 deletions src/plone/restapi/tests/test_content_get.py
View file
Expand Up @@ -23,6 +23,7 @@ class TestContentGet(unittest.TestCase):
def setUp(self):
self.app = self.layer['app']
self.portal = self.layer['portal']
self.portal_url = self.portal.absolute_url()
setRoles(self.portal, TEST_USER_ID, ['Member'])
login(self.portal, SITE_OWNER_NAME)
self.portal.invokeFactory(
Expand Down Expand Up @@ -120,7 +121,7 @@ def test_get_content_returns_fullobjects_correct_id(self):
self.assertEqual(response.status_code, 200)
self.assertEqual(3, len(response.json()['items']))
self.assertEqual(response.json()['items'][1]['@id'],
'http://localhost:55001/plone/folder1/folder2')
self.portal_url + u'/folder1/folder2')

def test_get_content_returns_fullobjects_non_recursive(self):
response = requests.get(
Expand Down Expand Up @@ -154,7 +155,7 @@ def test_get_content_includes_related_items(self):
self.assertEqual(1, len(response.json()['relatedItems']))
self.assertEqual(
[{
u'@id': u'http://localhost:55001/plone/folder1/folder2/doc2',
u'@id': self.portal_url + u'/folder1/folder2/doc2',
u'@type': u'Document',
u'description': u'',
u'review_state': u'published',
Expand Down
5 changes: 3 additions & 2 deletions src/plone/restapi/tests/test_content_post.py
View file
Expand Up @@ -27,6 +27,7 @@ class TestFolderCreate(unittest.TestCase):
def setUp(self):
self.app = self.layer['app']
self.portal = self.layer['portal']
self.portal_url = self.portal.absolute_url()
setRoles(self.portal, TEST_USER_ID, ['Member'])
login(self.portal, SITE_OWNER_NAME)
self.portal.invokeFactory(
Expand Down Expand Up @@ -56,7 +57,7 @@ def test_post_to_folder_creates_document(self):
self.assertEqual("mydocument", response.json().get('id'))
self.assertEqual("My Document", response.json().get('title'))

expected_url = "http://localhost:55001/plone/folder1/mydocument"
expected_url = self.portal_url + u"/folder1/mydocument"
self.assertEqual(expected_url, response.json().get('@id'))

def test_post_to_folder_creates_folder(self):
Expand All @@ -77,7 +78,7 @@ def test_post_to_folder_creates_folder(self):
self.assertEqual("myfolder", response.json().get('id'))
self.assertEqual("My Folder", response.json().get('title'))

expected_url = "http://localhost:55001/plone/folder1/myfolder"
expected_url = self.portal_url + u"/folder1/myfolder"
self.assertEqual(expected_url, response.json().get('@id'))

def test_post_without_type_returns_400(self):
Expand Down
12 changes: 6 additions & 6 deletions src/plone/restapi/tests/test_expansion.py
View file
Expand Up @@ -175,12 +175,12 @@ def test_navigation_expanded(self):
[
{
u'title': u'Home',
u'@id': u'http://localhost:55001/plone',
u'@id': self.portal_url + u'',
u'description': u'',
},
{
u'title': u'Some Folder',
u'@id': u'http://localhost:55001/plone/folder',
u'@id': self.portal_url + u'/folder',
u'description': u'',
}
],
Expand Down Expand Up @@ -254,7 +254,7 @@ def test_breadcrumbs_expanded(self):
[
{
u'title': u'Some Folder',
u'@id': u'http://localhost:55001/plone/folder'
u'@id': self.portal_url + u'/folder'
}
],
response.json()['@components']['breadcrumbs']['items']
Expand All @@ -279,7 +279,7 @@ def test_workflow_expanded(self):

self.assertEqual(response.status_code, 200)
self.assertEqual(
u'http://localhost:55001/plone/folder/@workflow',
self.portal_url + u'/folder/@workflow',
response.json().get('@components').get('workflow').get('@id')
)
self.assertEqual(
Expand All @@ -293,11 +293,11 @@ def test_workflow_expanded(self):
self.assertEqual(
[
{
u'@id': u'http://localhost:55001/plone/folder/@workflow/publish', # noqa
u'@id': self.portal_url + u'/folder/@workflow/publish', # noqa
u'title': u'Publish'
},
{
u'@id': u'http://localhost:55001/plone/folder/@workflow/submit', # noqa
u'@id': self.portal_url + u'/folder/@workflow/submit', # noqa
u'title': u'Submit for publication'
}
],
Expand Down
14 changes: 7 additions & 7 deletions src/plone/restapi/tests/test_roles.py
View file
Expand Up @@ -23,31 +23,31 @@ def test_roles_endpoint_lists_roles(self):
response = self.api_session.get('/@roles')

self.assertItemsEqual([
{u'@id': u'http://localhost:55001/plone/@roles/Contributor',
{u'@id': self.portal_url + u'/@roles/Contributor',
u'@type': u'role',
u'id': u'Contributor',
u'title': u'Contributor'},
{u'@id': u'http://localhost:55001/plone/@roles/Editor',
{u'@id': self.portal_url + u'/@roles/Editor',
u'@type': u'role',
u'id': u'Editor',
u'title': u'Editor'},
{u'@id': u'http://localhost:55001/plone/@roles/Member',
{u'@id': self.portal_url + u'/@roles/Member',
u'@type': u'role',
u'id': u'Member',
u'title': u'Member'},
{u'@id': u'http://localhost:55001/plone/@roles/Reader',
{u'@id': self.portal_url + u'/@roles/Reader',
u'@type': u'role',
u'id': u'Reader',
u'title': u'Reader'},
{u'@id': u'http://localhost:55001/plone/@roles/Reviewer',
{u'@id': self.portal_url + u'/@roles/Reviewer',
u'@type': u'role',
u'id': u'Reviewer',
u'title': u'Reviewer'},
{u'@id': u'http://localhost:55001/plone/@roles/Site Administrator',
{u'@id': self.portal_url + u'/@roles/Site Administrator',
u'@type': u'role',
u'id': u'Site Administrator',
u'title': u'Site Administrator'},
{u'@id': u'http://localhost:55001/plone/@roles/Manager',
{u'@id': self.portal_url + u'/@roles/Manager',
u'@type': u'role',
u'id': u'Manager',
u'title': u'Manager'}],
Expand Down
10 changes: 5 additions & 5 deletions src/plone/restapi/tests/test_search.py
View file
Expand Up @@ -146,7 +146,7 @@ def test_partial_metadata_retrieval(self):
response = self.api_session.get('/@search', params=query)

self.assertDictContainsSubset(
{u'@id': u'http://localhost:55001/plone/folder/doc',
{u'@id': self.portal_url + u'/folder/doc',
u'title': u'Lorem Ipsum',
u'portal_type': u'DXTestDocument',
u'review_state': u'private'},
Expand All @@ -157,7 +157,7 @@ def test_full_metadata_retrieval(self):
response = self.api_session.get('/@search', params=query)

self.assertDictContainsSubset(
{u'@id': u'http://localhost:55001/plone/folder/doc',
{u'@id': self.portal_url + u'/folder/doc',
u'Creator': u'test_user_1_',
u'Description': u'',
u'EffectiveDate': u'None',
Expand All @@ -178,7 +178,7 @@ def test_full_metadata_retrieval(self):
u'getObjSize': u'0 KB',
u'getPath': u'/plone/folder/doc',
u'getRemoteUrl': None,
u'getURL': u'http://localhost:55001/plone/folder/doc',
u'getURL': self.portal_url + u'/folder/doc',
u'id': u'doc',
u'in_response_to': None,
u'is_folderish': False,
Expand All @@ -204,7 +204,7 @@ def test_full_objects_retrieval(self):
u'<p>Some Text</p>',
response.json()['items'][0]['test_richtext_field']['data'])
self.assertEqual(
'http://localhost:55001/plone/folder/doc',
self.portal_url + u'/folder/doc',
response.json()['items'][0]['@id'])

def test_full_objects_retrieval_discussion(self):
Expand Down Expand Up @@ -574,5 +574,5 @@ def test_full_objects_retrieval(self):
{u'data': u' Some Text ', u'content-type': u'text/plain'},
response.json()['items'][0]['testTextField'])
self.assertEqual(
'http://localhost:55001/plone/folder/doc',
self.portal_url + u'/folder/doc',
response.json()['items'][0]['@id'])
2 changes: 1 addition & 1 deletion src/plone/restapi/tests/test_services.py
View file
Expand Up @@ -132,7 +132,7 @@ def test_get_news_item(self):
response.json()['image_caption']
)
self.assertDictContainsSubset(
{'download': u'http://localhost:55001/plone/news1/@@images/uuid1.png'}, # noqa
{'download': self.portal_url + u'/news1/@@images/uuid1.png'}, # noqa
response.json()['image']
)

Expand Down
6 changes: 3 additions & 3 deletions src/plone/restapi/tests/test_services_breadcrumbs.py
View file
Expand Up @@ -42,13 +42,13 @@ def test_breadcrumbs(self):
self.assertEqual(
response.json(),
{
'@id': 'http://localhost:55001/plone/folder/doc1/@breadcrumbs',
'@id': self.portal_url + u'/folder/doc1/@breadcrumbs',
'items': [
{
u'@id': u'http://localhost:55001/plone/folder',
u'@id': self.portal_url + u'/folder',
u'title': u'Some Folder'
}, {
u'@id': u'http://localhost:55001/plone/folder/doc1',
u'@id': self.portal_url + u'/folder/doc1',
u'title': u'A document'
}
]
Expand Down
8 changes: 4 additions & 4 deletions src/plone/restapi/tests/test_services_navigation.py
View file
Expand Up @@ -62,20 +62,20 @@ def test_navigation_with_no_params_gets_only_top_level(self):
self.assertEqual(
response.json(),
{
'@id': 'http://localhost:55001/plone/folder/@navigation',
'@id': self.portal_url + u'/folder/@navigation',
'items': [
{
u'title': u'Home',
u'@id': u'http://localhost:55001/plone',
u'@id': self.portal_url,
u'description': u'',
},
{
u'title': u'Some Folder',
u'@id': u'http://localhost:55001/plone/folder',
u'@id': self.portal_url + u'/folder',
u'description': u'',
},
{
u'@id': u'http://localhost:55001/plone/folder2',
u'@id': self.portal_url + u'/folder2',
u'description': u'',
u'title': u'Some Folder 2'
}
Expand Down
14 changes: 7 additions & 7 deletions src/plone/restapi/tests/test_services_vocabularies.py
View file
Expand Up @@ -62,12 +62,12 @@ def test_get_vocabulary(self):
response = response.json()
self.assertEqual(
response,
{u'@id': u'http://localhost:55001/plone/@vocabularies/''plone.restapi.tests.test_vocabulary', # noqa
{u'@id': self.portal_url + u'/@vocabularies/''plone.restapi.tests.test_vocabulary', # noqa
u'terms': [
{u'@id': u'http://localhost:55001/plone/@vocabularies/plone.restapi.tests.test_vocabulary/token1', # noqa
{u'@id': self.portal_url + u'/@vocabularies/plone.restapi.tests.test_vocabulary/token1', # noqa
u'title': u'Title 1',
u'token': u'token1'},
{u'@id': u'http://localhost:55001/plone/@vocabularies/plone.restapi.tests.test_vocabulary/token2', # noqa
{u'@id': self.portal_url + u'/@vocabularies/plone.restapi.tests.test_vocabulary/token2', # noqa
u'title': u'Title 2',
u'token': u'token2'}]})

Expand All @@ -94,7 +94,7 @@ def test_get_all_vocabularies(self):
self.assertEqual(
[
{
u'@id': u'http://localhost:55001/plone/@vocabularies/plone.restapi.tests.test_vocabulary', # noqa
u'@id': self.portal_url + u'/@vocabularies/plone.restapi.tests.test_vocabulary', # noqa
u'title': u'plone.restapi.tests.test_vocabulary'
}
],
Expand Down Expand Up @@ -128,12 +128,12 @@ def test_context_vocabulary(self):
self.assertEqual(
response.json(),
{
u'@id': u'http://localhost:55001/plone/testdoc/@vocabularies/plone.restapi.tests.test_context_vocabulary', # noqa
u'@id': self.portal_url + u'/testdoc/@vocabularies/plone.restapi.tests.test_context_vocabulary', # noqa
u'terms': [
{u'@id': u'http://localhost:55001/plone/testdoc/@vocabularies/plone.restapi.tests.test_context_vocabulary/id', # noqa
{u'@id': self.portal_url + u'/testdoc/@vocabularies/plone.restapi.tests.test_context_vocabulary/id', # noqa
u'title': u'testdoc',
u'token': u'id'},
{u'@id': u'http://localhost:55001/plone/testdoc/@vocabularies/plone.restapi.tests.test_context_vocabulary/title', # noqa
{u'@id': self.portal_url + u'/testdoc/@vocabularies/plone.restapi.tests.test_context_vocabulary/title', # noqa
u'title': u'Document 1',
u'token': u'title'}]
})
Expand Down

0 comments on commit 4cb5fa0

Please sign in to comment.