Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Normalize http examples #1215

Merged
merged 14 commits into from
Sep 3, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions base.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ allow-hosts =
code.google.com
robotframework.googlecode.com

[versions]
# Do not use a release of plone.restapi:
plone.restapi =

[instance]
recipe = plone.recipe.zope2instance
user = admin:admin
Expand Down
10 changes: 0 additions & 10 deletions buildout.cfg
Original file line number Diff line number Diff line change
@@ -1,12 +1,2 @@
[buildout]
extends = plone-5.2.x.cfg
versions=versions

[versions]
plone.restapi =

plone.schema = 1.3.0
plone.dexterity = 2.9.8

# 3.0 drops python2 compatibility
pyroma = 2.6.1
2 changes: 2 additions & 0 deletions news/1213.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix testing of a checkout instead of a released package.
[maurits]
3 changes: 0 additions & 3 deletions plone-5.2.x-performance.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,3 @@ profiles =
plone.app.contenttypes:plone-content
plone.restapi:performance
site-replace = True

[versions]
plone.restapi =
2 changes: 1 addition & 1 deletion plone-5.2.x.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[buildout]
extends =
base.cfg
https://dist.plone.org/release/5.2.5/versions.cfg
base.cfg
find-links += https://dist.plone.org/thirdparty/
versions=versions

Expand Down
6 changes: 3 additions & 3 deletions src/plone/restapi/tests/http-examples/404_not_found.resp
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ HTTP/1.1 404 Not Found
Content-Type: application/json

{
"message": "Resource not found: http://localhost:55001/plone/non-existing-resource",
"type": "NotFound"
}
"message": "Resource not found: http://localhost:55001/plone/non-existing-resource",
"type": "NotFound"
}
92 changes: 46 additions & 46 deletions src/plone/restapi/tests/http-examples/batching.resp
Original file line number Diff line number Diff line change
Expand Up @@ -2,49 +2,49 @@ HTTP/1.1 200 OK
Content-Type: application/json

{
"@id": "http://localhost:55001/plone/folder/@search",
"batching": {
"@id": "http://localhost:55001/plone/folder/@search?b_size=5&sort_on=path",
"first": "http://localhost:55001/plone/folder/@search?b_start=0&b_size=5&sort_on=path",
"last": "http://localhost:55001/plone/folder/@search?b_start=5&b_size=5&sort_on=path",
"next": "http://localhost:55001/plone/folder/@search?b_start=5&b_size=5&sort_on=path"
},
"items": [
{
"@id": "http://localhost:55001/plone/folder",
"@type": "Folder",
"description": "",
"review_state": "private",
"title": "Folder"
},
{
"@id": "http://localhost:55001/plone/folder/doc-1",
"@type": "Document",
"description": "",
"review_state": "private",
"title": "Document 1"
},
{
"@id": "http://localhost:55001/plone/folder/doc-2",
"@type": "Document",
"description": "",
"review_state": "private",
"title": "Document 2"
},
{
"@id": "http://localhost:55001/plone/folder/doc-3",
"@type": "Document",
"description": "",
"review_state": "private",
"title": "Document 3"
},
{
"@id": "http://localhost:55001/plone/folder/doc-4",
"@type": "Document",
"description": "",
"review_state": "private",
"title": "Document 4"
}
],
"items_total": 8
}
"@id": "http://localhost:55001/plone/folder/@search",
"batching": {
"@id": "http://localhost:55001/plone/folder/@search?b_size=5&sort_on=path",
"first": "http://localhost:55001/plone/folder/@search?b_start=0&b_size=5&sort_on=path",
"last": "http://localhost:55001/plone/folder/@search?b_start=5&b_size=5&sort_on=path",
"next": "http://localhost:55001/plone/folder/@search?b_start=5&b_size=5&sort_on=path"
},
"items": [
{
"@id": "http://localhost:55001/plone/folder",
"@type": "Folder",
"description": "",
"review_state": "private",
"title": "Folder"
},
{
"@id": "http://localhost:55001/plone/folder/doc-1",
"@type": "Document",
"description": "",
"review_state": "private",
"title": "Document 1"
},
{
"@id": "http://localhost:55001/plone/folder/doc-2",
"@type": "Document",
"description": "",
"review_state": "private",
"title": "Document 2"
},
{
"@id": "http://localhost:55001/plone/folder/doc-3",
"@type": "Document",
"description": "",
"review_state": "private",
"title": "Document 3"
},
{
"@id": "http://localhost:55001/plone/folder/doc-4",
"@type": "Document",
"description": "",
"review_state": "private",
"title": "Document 4"
}
],
"items_total": 8
}
18 changes: 9 additions & 9 deletions src/plone/restapi/tests/http-examples/breadcrumbs.resp
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ HTTP/1.1 200 OK
Content-Type: application/json

{
"@id": "http://localhost:55001/plone/front-page/@breadcrumbs",
"items": [
{
"@id": "http://localhost:55001/plone/front-page",
"title": "Welcome to Plone"
}
],
"root": "http://localhost:55001/plone"
}
"@id": "http://localhost:55001/plone/front-page/@breadcrumbs",
"items": [
{
"@id": "http://localhost:55001/plone/front-page",
"title": "Welcome to Plone"
}
],
"root": "http://localhost:55001/plone"
}
Loading