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

IBX-7409: Changed Content Type to content type #43

Merged
merged 1 commit into from
Jan 22, 2024
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
6 changes: 3 additions & 3 deletions features/setup/setup.feature
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,21 @@ Feature: Set system to desired state before tests

@APIUser:admin
Scenario: Set up the system to test caching of subrequests
Given I create a "embeddedContentType" Content Type in "Content" with "embeddedContentType" identifier
Given I create a "embeddedContentType" content type in "Content" with "embeddedContentType" identifier
| Field Type | Name | Identifier | Required | Searchable | Translatable |
| Text line | Name | name | yes | yes | yes |
And I create "embeddedContentType" Content items in root in "eng-GB"
| name |
| EmbeddedItemNoEsi |
| EmbeddedItemEsi |
And I create a "embeddingContentType_no_esi" Content Type in "Content" with "embeddingContentType_no_esi" identifier
And I create a "embeddingContentType_no_esi" content type in "Content" with "embeddingContentType_no_esi" identifier
| Field Type | Name | Identifier | Required | Searchable | Translatable |
| Text line | Name | name | yes | yes | yes |
| Content relation (single) | Relation | relation | yes | no | yes |
And I create "embeddingContentType_no_esi" Content items in root in "eng-GB"
| name | relation |
| EmbeddingItemNoEsi | /EmbeddedItemNoEsi |
And I create a "embeddingContentType_esi" Content Type in "Content" with "embeddingContentType_esi" identifier
And I create a "embeddingContentType_esi" content type in "Content" with "embeddingContentType_esi" identifier
| Field Type | Name | Identifier | Required | Searchable | Translatable |
| Text line | Name | name | yes | yes | yes |
| Content relation (single) | Relation | relation | yes | no | yes |
Expand Down
6 changes: 3 additions & 3 deletions features/symfony/cache.feature
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Feature: As an site administrator I want my pages to be cached using Symfony Htt
And I am viewing the pages on siteaccess "site" as <user> "<password>"
When I visit <itemName> on siteaccess "site"
And I reload the page
Then I see correct preview data for "Folder" Content Type
Then I see correct preview data for "Folder" content type
| field | value |
| title | <itemName> |
And response headers contain
Expand All @@ -30,15 +30,15 @@ Feature: As an site administrator I want my pages to be cached using Symfony Htt
| TestFolder | <itemName> |
And I am viewing the pages on siteaccess "site" as "<user>" with password "<password>"
And I visit "<itemName>" on siteaccess "site"
And I see correct preview data for "Folder" Content Type
And I see correct preview data for "Folder" content type
| field | value |
| title | <itemName> |
When I edit "<itemName>" Content item in "eng-GB"
| short_name |
| <itemNameAfterEdit> |
And I reload the page
And I reload the page
Then I see correct preview data for "Folder" Content Type
Then I see correct preview data for "Folder" content type
| field | value |
| title | <itemNameAfterEdit> |
And response headers contain
Expand Down
4 changes: 2 additions & 2 deletions features/symfony/embed.feature
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ Feature: Caching of embedded items

@admin
Scenario Outline: Editing an embedded item refreshes the embedding item as well
Given I create a "embeddedContentType" Content Type in "Content" with "embeddedContentType" identifier
Given I create a "embeddedContentType" content type in "Content" with "embeddedContentType" identifier
| Field Type | Name | Identifier | Required | Searchable | Translatable |
| Text line | Name | name | yes | yes | yes |
And I create "embeddedContentType" Content items in root in "eng-GB"
| name |
| <embeddedItemName> |
And I create a "embeddingContentType" Content Type in "Content" with "embeddingContentType" identifier
And I create a "embeddingContentType" content type in "Content" with "embeddingContentType" identifier
| Field Type | Name | Identifier | Required | Searchable | Translatable |
| Text line | Name | name | yes | yes | yes |
| Content relation (single) | Relation | relation | yes | no | yes |
Expand Down
2 changes: 1 addition & 1 deletion features/symfony/permissions.feature
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Feature: Cached response is different for users with different permissions

@admin
Scenario: Embedded Content Items are cached based on users permissions
Given I create a "testContentType" Content Type in "Content" with "testContentType" identifier
Given I create a "testContentType" content type in "Content" with "testContentType" identifier
| Field Type | Name | Identifier | Required | Searchable | Translatable |
| Text line | Name | name | yes | yes | yes |
| Content relation (single) | Relation | relation | yes | no | yes |
Expand Down
6 changes: 3 additions & 3 deletions features/varnish/cache.feature
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Feature: As an site administrator I want my pages to be cached using Varnish
| Header | Value |
| X-Cache | MISS |
And I reload the page
Then I see correct preview data for "Folder" Content Type
Then I see correct preview data for "Folder" content type
| field | value |
| title | <itemName> |
And response headers contain
Expand All @@ -32,7 +32,7 @@ Feature: As an site administrator I want my pages to be cached using Varnish
And I am viewing the pages on siteaccess "site" as "<user>" "<password>"
And I visit "<itemName>" on siteaccess "site"
And I reload the page
And I see correct preview data for "Folder" Content Type
And I see correct preview data for "Folder" content type
| field | value |
| title | <itemName> |
And response headers contain
Expand All @@ -47,7 +47,7 @@ Feature: As an site administrator I want my pages to be cached using Varnish
# Second reload is needed because of soft purging
And I reload the page
And I reload the page
Then I see correct preview data for "Folder" Content Type
Then I see correct preview data for "Folder" content type
| field | value |
| title | <itemNameAfterEdit> |
And response headers contain
Expand Down
4 changes: 2 additions & 2 deletions features/varnish/embed.feature
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ Feature: Caching of embedded items

@admin
Scenario Outline: Editing an embedded item refreshes the embedding item as well
Given I create a "embeddedContentType" Content Type in "Content" with "embeddedContentType" identifier
Given I create a "embeddedContentType" content type in "Content" with "embeddedContentType" identifier
| Field Type | Name | Identifier | Required | Searchable | Translatable |
| Text line | Name | name | yes | yes | yes |
And I create "embeddedContentType" Content items in root in "eng-GB"
| name |
| <embeddedItemName> |
And I create a "embeddingContentType" Content Type in "Content" with "embeddingContentType" identifier
And I create a "embeddingContentType" content type in "Content" with "embeddingContentType" identifier
| Field Type | Name | Identifier | Required | Searchable | Translatable |
| Text line | Name | name | yes | yes | yes |
| Content relation (single) | Relation | relation | yes | no | yes |
Expand Down
2 changes: 1 addition & 1 deletion features/varnish/permissions.feature
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Feature: Cached response is different for users with different permissions

@admin
Scenario: Embedded Content Items are cached based on users permissions
Given I create a "testContentType" Content Type in "Content" with "testContentType" identifier
Given I create a "testContentType" content type in "Content" with "testContentType" identifier
| Field Type | Name | Identifier | Required | Searchable | Translatable |
| Text line | Name | name | yes | yes | yes |
| Content relation (single) | Relation | relation | yes | no | yes |
Expand Down
4 changes: 2 additions & 2 deletions features/varnish/translations.feature
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Feature: As an site administrator I want my pages to be cached using Varnish
And I am viewing the pages on siteaccess "site" as "<user>" "<password>"
And I visit "<itemName>" on siteaccess "site"
And I reload the page
And I see correct preview data for "Folder" Content Type
And I see correct preview data for "Folder" content type
| field | value |
| title | <itemName> |
And response headers contain
Expand All @@ -23,7 +23,7 @@ Feature: As an site administrator I want my pages to be cached using Varnish
# Second reload is needed because of soft purging
And I reload the page
And I reload the page
Then I see correct preview data for "Folder" Content Type
Then I see correct preview data for "Folder" content type
| field | value |
| title | <itemNameAfterEdit> |
And response headers contain
Expand Down
Loading