Skip to content

Commit aa857ed

Browse files
committed
Merge branch '2.1'
2 parents 1b963f4 + ba2c128 commit aa857ed

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

features/graphql/collection.feature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Feature: GraphQL collection support
3131
And the header "Content-Type" should be equal to "application/json"
3232
And the JSON node "data.dummies.edges[2].node.name" should be equal to "Dummy #3"
3333
And the JSON node "data.dummies.edges[2].node.relatedDummy.name" should be equal to "RelatedDummy #3"
34-
And the JSON node "data.dummies.edges[2].node.relatedDummy.thirdLevel.level" should be equal to "3"
34+
And the JSON node "data.dummies.edges[2].node.relatedDummy.thirdLevel.level" should be equal to 3
3535

3636
@createSchema
3737
@dropSchema

features/hydra/collection.feature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ Feature: Collections support
398398

399399
@dropSchema
400400
@createSchema
401-
Scenario: Allow passing "0" to `itemsPerPage`
401+
Scenario: Allow passing 0 to `itemsPerPage`
402402
When I send a "GET" request to "/dummies?itemsPerPage=0"
403403
Then the response status code should be 200
404404
And the response should be in JSON

features/integration/fos_user.feature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Feature: FOSUser integration
2929
"username": "dummy.user"
3030
}
3131
"""
32-
And the password "azerty" for user "1" should be hashed
32+
And the password "azerty" for user 1 should be hashed
3333

3434
@dropSchema
3535
Scenario: Delete a user

features/swagger/docs.feature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ Feature: Documentation support
6969
And the JSON node "paths./related_dummies/{id}/related_to_dummy_friends.get.parameters[1].in" should be equal to "query"
7070
And the JSON node "paths./related_dummies/{id}/related_to_dummy_friends.get.parameters[1].required" should be false
7171
And the JSON node "paths./related_dummies/{id}/related_to_dummy_friends.get.parameters[1].type" should be equal to "string"
72-
And the JSON node "paths./related_dummies/{id}/related_to_dummy_friends.get.parameters" should have "2" element
72+
And the JSON node "paths./related_dummies/{id}/related_to_dummy_friends.get.parameters" should have 2 element
7373

7474
# Subcollection - check schema
7575
And the JSON node "paths./related_dummies/{id}/related_to_dummy_friends.get.responses.200.schema.items.$ref" should be equal to "#/definitions/RelatedToDummyFriend-fakemanytomany"

0 commit comments

Comments
 (0)