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 #59

Merged
merged 2 commits 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
4 changes: 2 additions & 2 deletions features/ContentEdit/create_without_draft.feature
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Feature: Edit content

Scenario: Create a folder without a draft
Given that I have permission to create folders
And there is a Content Type "folder" with the id "1"
And there is a content type "folder" with the id "1"
#And there is a Location with the id "2"
When I go to "content/create/nodraft/folder/eng-GB/2"
Then I should see a folder content edit form
Expand All @@ -15,7 +15,7 @@ Scenario: Create a folder without a draft

@javascript
Scenario: Content validation errors are reported back
Given that there is a Content Type with any kind of constraints on a Field Definition
Given that there is a content type with any kind of constraints on a Field Definition
And that I have permission to create content of this type
When I go to the content creation page for this type
And I fill in the constrained field with an invalid value
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Feature: Checkbox field value edit form
I want the Checkbox field form to implement the FieldType's behaviour

Background:
Given a Content Type with an ezboolean field definition
Given a content type with an ezboolean field definition

Scenario: The attributes of the field have a form representation
When I view the edit form for this field
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Feature: Selection field value edit form
I want the Selection field form to implement the FieldType's behaviour

Background:
Given a Content Type with an ezselection field definition
Given a content type with an ezselection field definition

Scenario: The attributes of the field have a form representation
Given I view the edit form for this field
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Feature: TextLine field value edit form
I want the ezuser field form to implement the FieldType's behaviour

Background:
Given a Content Type with a textline field definition
Given a content type with a textline field definition

Scenario: The attributes of a textline field have a form representation
When I view the edit form for this field
Expand Down
2 changes: 1 addition & 1 deletion features/FieldTypeForm/user_fieldtype_edit_form.feature
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Feature: User field value edit form
I want the ezuser field form to implement the FieldType's behaviour

Background:
Given a Content Type with a user field definition
Given a content type with a user field definition

Scenario: The attributes of a user field have a form representation
When I view the edit user form for this field
Expand Down
2 changes: 1 addition & 1 deletion src/lib/Behat/Context/ContentEditContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ public function thereIsARelevantErrorMessageLinkedToTheInvalidField()
}

/**
* @Given /^that there is a Content Type with any kind of constraints on a Field Definition$/
* @Given /^that there is a content type with any kind of constraints on a Field Definition$/
*/
public function thereIsAContentTypeWithAnyKindOfConstraintsOnAFieldDefinition()
{
Expand Down
6 changes: 3 additions & 3 deletions src/lib/Behat/Context/ContentTypeContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public function __construct(PermissionResolver $permissionResolver, ContentTypeS
}

/**
* @Given /^there is a Content Type "([^"]*)" with the id "([^"]*)"$/
* @Given /^there is a content type "([^"]*)" with the id "([^"]*)"$/
*/
public function thereIsAContentTypeWithId($contentTypeIdentifier, $id)
{
Expand All @@ -61,7 +61,7 @@ public function thereIsAContentTypeWithId($contentTypeIdentifier, $id)
}

/**
* @Given I remove :fieldIdentifier field from :contentTypeIdentifier Content Type
* @Given I remove :fieldIdentifier field from :contentTypeIdentifier content type
*/
public function iRemoveFieldFromContentType($fieldIdentifier, $contentTypeIdentifier)
{
Expand Down Expand Up @@ -94,7 +94,7 @@ public function addFieldsTo($contentTypeIdentifier, array $fieldDefinitions)
public function getCurrentContentType()
{
if ($this->currentContentType === null) {
throw new Exception('No current Content Type has been defined in the context');
throw new Exception('No current content type has been defined in the context');
}

return $this->currentContentType;
Expand Down
4 changes: 2 additions & 2 deletions src/lib/Behat/Context/FieldTypeFormContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ public function gatherContexts(BeforeScenarioScope $scope)
}

/**
* @Given a Content Type with a(n) :fieldTypeIdentifier field definition
* @Given a Content Type :contentTypeName with a(n) :fieldTypeIdentifier field definition
* @Given a content type with a(n) :fieldTypeIdentifier field definition
* @Given a content type :contentTypeName with a(n) :fieldTypeIdentifier field definition
*/
public function aContentTypeWithAGivenFieldDefinition($fieldTypeIdentifier, $contentTypeName = null)
{
Expand Down
2 changes: 1 addition & 1 deletion src/lib/Behat/Context/UserRegistrationContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ public function iCanSeeTheRegistrationForm()
}

/**
* @Given /^it matches the structure of the configured registration user Content Type$/
* @Given /^it matches the structure of the configured registration user content type$/
*/
public function itMatchesTheStructureOfTheConfiguredRegistrationUserContentType()
{
Expand Down
2 changes: 1 addition & 1 deletion src/lib/Content/View/Builder/ContentCreateViewBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ private function resolveContentType(array $parameters, array $languageCodes): Co

throw new InvalidArgumentException(
'ContentType',
'No Content Type could be loaded from the parameters'
'No content type could be loaded from the parameters'
);
}

Expand Down
Loading