Skip to content

Commit c76005b

Browse files
jdeniaujdeniau
authored
Merge branch '2.1' into jd-fix-nestedUpdate
2 parents 99bc0b0 + ba2c128 commit c76005b

13 files changed

+44
-44
lines changed

‎features/bootstrap/FeatureContext.php

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public function dropDatabase()
119119
}
120120

121121
/**
122-
* @Given there is :nb dummy objects
122+
* @Given there are :nb dummy objects
123123
*/
124124
public function thereIsDummyObjects(int $nb)
125125
{
@@ -180,7 +180,7 @@ public function thereAreFooDummyObjectsWithFakeNames($nb)
180180
}
181181

182182
/**
183-
* @Given there is :nb dummy group objects
183+
* @Given there are :nb dummy group objects
184184
*/
185185
public function thereIsDummyGroupObjects(int $nb)
186186
{
@@ -198,7 +198,7 @@ public function thereIsDummyGroupObjects(int $nb)
198198
}
199199

200200
/**
201-
* @Given there is :nb dummy property objects
201+
* @Given there are :nb dummy property objects
202202
*/
203203
public function thereIsDummyPropertyObjects(int $nb)
204204
{
@@ -239,7 +239,7 @@ public function thereIsEmbeddedDummyObjects(int $nb)
239239
}
240240

241241
/**
242-
* @Given there is :nb dummy objects with relatedDummy
242+
* @Given there are :nb dummy objects with relatedDummy
243243
*/
244244
public function thereIsDummyObjectsWithRelatedDummy(int $nb)
245245
{
@@ -260,7 +260,7 @@ public function thereIsDummyObjectsWithRelatedDummy(int $nb)
260260
}
261261

262262
/**
263-
* @Given there is :nb dummy objects with embeddedDummy
263+
* @Given there are :nb dummy objects with embeddedDummy
264264
*/
265265
public function thereIsDummyObjectsWithEmbeddedDummy(int $nb)
266266
{
@@ -279,7 +279,7 @@ public function thereIsDummyObjectsWithEmbeddedDummy(int $nb)
279279
}
280280

281281
/**
282-
* @Given there is :nb dummy objects having each :nbrelated relatedDummies
282+
* @Given there are :nb dummy objects having each :nbrelated relatedDummies
283283
*/
284284
public function thereIsDummyObjectsWithRelatedDummies(int $nb, int $nbrelated)
285285
{
@@ -304,7 +304,7 @@ public function thereIsDummyObjectsWithRelatedDummies(int $nb, int $nbrelated)
304304
}
305305

306306
/**
307-
* @Given there is :nb dummy objects with dummyDate
307+
* @Given there are :nb dummy objects with dummyDate
308308
*/
309309
public function thereIsDummyObjectsWithDummyDate(int $nb)
310310
{
@@ -330,7 +330,7 @@ public function thereIsDummyObjectsWithDummyDate(int $nb)
330330
}
331331

332332
/**
333-
* @Given there is :nb dummy objects with dummyDate and dummyBoolean :bool
333+
* @Given there are :nb dummy objects with dummyDate and dummyBoolean :bool
334334
*/
335335
public function thereIsDummyObjectsWithDummyDateAndDummyBoolean(int $nb, string $bool)
336336
{
@@ -366,7 +366,7 @@ public function thereIsDummyObjectsWithDummyDateAndDummyBoolean(int $nb, string
366366
}
367367

368368
/**
369-
* @Given there is :nb dummy objects with dummyDate and relatedDummy
369+
* @Given there are :nb dummy objects with dummyDate and relatedDummy
370370
*/
371371
public function thereIsDummyObjectsWithDummyDateAndRelatedDummy(int $nb)
372372
{
@@ -394,7 +394,7 @@ public function thereIsDummyObjectsWithDummyDateAndRelatedDummy(int $nb)
394394
}
395395

396396
/**
397-
* @Given there is :nb embedded dummy objects with dummyDate and embeddedDummy
397+
* @Given there are :nb embedded dummy objects with dummyDate and embeddedDummy
398398
*/
399399
public function thereIsDummyObjectsWithDummyDateAndEmbeddedDummy($nb)
400400
{
@@ -420,7 +420,7 @@ public function thereIsDummyObjectsWithDummyDateAndEmbeddedDummy($nb)
420420
}
421421

422422
/**
423-
* @Given there is :nb dummy objects with dummyPrice
423+
* @Given there are :nb dummy objects with dummyPrice
424424
*/
425425
public function thereIsDummyObjectsWithDummyPrice(int $nb)
426426
{
@@ -441,7 +441,7 @@ public function thereIsDummyObjectsWithDummyPrice(int $nb)
441441
}
442442

443443
/**
444-
* @Given there is :nb dummy objects with dummyBoolean :bool
444+
* @Given there are :nb dummy objects with dummyBoolean :bool
445445
*/
446446
public function thereIsDummyObjectsWithDummyBoolean(int $nb, string $bool)
447447
{
@@ -469,7 +469,7 @@ public function thereIsDummyObjectsWithDummyBoolean(int $nb, string $bool)
469469
}
470470

471471
/**
472-
* @Given there is :nb embedded dummy objects with embeddedDummy.dummyBoolean :bool
472+
* @Given there are :nb embedded dummy objects with embeddedDummy.dummyBoolean :bool
473473
*/
474474
public function thereIsDummyObjectsWithEmbeddedDummyBoolean(int $nb, string $bool)
475475
{
@@ -496,7 +496,7 @@ public function thereIsDummyObjectsWithEmbeddedDummyBoolean(int $nb, string $boo
496496
}
497497

498498
/**
499-
* @Given there is :nb embedded dummy objects with relatedDummy.embeddedDummy.dummyBoolean :bool
499+
* @Given there are :nb embedded dummy objects with relatedDummy.embeddedDummy.dummyBoolean :bool
500500
*/
501501
public function thereIsDummyObjectsWithRelationEmbeddedDummyBoolean(int $nb, string $bool)
502502
{
@@ -758,7 +758,7 @@ public function createPeopleWithPets()
758758
}
759759

760760
/**
761-
* @Given there is :nb dummydate objects with dummyDate
761+
* @Given there are :nb dummydate objects with dummyDate
762762
*/
763763
public function thereIsDummyDateObjectsWithDummyDate(int $nb)
764764
{

‎features/doctrine/boolean_filter.feature

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ Feature: Boolean filter on collections
55

66
@createSchema
77
Scenario: Get collection by dummyBoolean true
8-
Given there is "15" dummy objects with dummyBoolean true
9-
And there is "10" dummy objects with dummyBoolean false
8+
Given there are 15 dummy objects with dummyBoolean true
9+
And there are 10 dummy objects with dummyBoolean false
1010
When I send a "GET" request to "/dummies?dummyBoolean=true"
1111
Then the response status code should be 200
1212
And the response should be in JSON
@@ -167,8 +167,8 @@ Feature: Boolean filter on collections
167167
And the JSON node "hydra:totalItems" should be equal to 10
168168

169169
Scenario: Get collection by embeddedDummy.dummyBoolean true
170-
Given there is "15" embedded dummy objects with embeddedDummy.dummyBoolean true
171-
And there is "10" embedded dummy objects with embeddedDummy.dummyBoolean false
170+
Given there are 15 embedded dummy objects with embeddedDummy.dummyBoolean true
171+
And there are 10 embedded dummy objects with embeddedDummy.dummyBoolean false
172172
When I send a "GET" request to "/embedded_dummies?embeddedDummy.dummyBoolean=true"
173173
Then the response status code should be 200
174174
And the response should be in JSON
@@ -329,8 +329,8 @@ Feature: Boolean filter on collections
329329
And the JSON node "hydra:totalItems" should be equal to 10
330330

331331
Scenario: Get collection by association with embed relatedDummy.embeddedDummy.dummyBoolean true
332-
Given there is "15" embedded dummy objects with relatedDummy.embeddedDummy.dummyBoolean true
333-
And there is "10" embedded dummy objects with relatedDummy.embeddedDummy.dummyBoolean false
332+
Given there are 15 embedded dummy objects with relatedDummy.embeddedDummy.dummyBoolean true
333+
And there are 10 embedded dummy objects with relatedDummy.embeddedDummy.dummyBoolean false
334334
When I send a "GET" request to "/embedded_dummies?relatedDummy.embeddedDummy.dummyBoolean=true"
335335
Then the response status code should be 200
336336
And the response should be in JSON

‎features/doctrine/date_filter.feature

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Feature: Date filter on collections
55

66
@createSchema
77
Scenario: Get collection filtered by date
8-
Given there is "30" dummy objects with dummyDate
8+
Given there are 30 dummy objects with dummyDate
99
When I send a "GET" request to "/dummies?dummyDate[after]=2015-04-28"
1010
Then the response status code should be 200
1111
And the response should be in JSON
@@ -266,7 +266,7 @@ Feature: Date filter on collections
266266

267267
@dropSchema
268268
Scenario: Get collection filtered by association date
269-
Given there is "30" dummy objects with dummyDate and relatedDummy
269+
Given there are 30 dummy objects with dummyDate and relatedDummy
270270
When I send a "GET" request to "/dummies?relatedDummy.dummyDate[after]=2015-04-28"
271271
Then the response status code should be 200
272272
And the response should be in JSON
@@ -387,7 +387,7 @@ Feature: Date filter on collections
387387
@dropSchema
388388
@createSchema
389389
Scenario: Get collection filtered by association date
390-
Given there is "2" dummy objects with dummyDate and relatedDummy
390+
Given there are 2 dummy objects with dummyDate and relatedDummy
391391
When I send a "GET" request to "/dummies?relatedDummy.dummyDate[after]=2015-04-28"
392392
Then the response status code should be 200
393393
And the response should be in JSON
@@ -657,7 +657,7 @@ Feature: Date filter on collections
657657
@dropSchema
658658
@createSchema
659659
Scenario: Get collection filtered by date that is not a datetime
660-
Given there is "30" dummydate objects with dummyDate
660+
Given there are 30 dummydate objects with dummyDate
661661
When I send a "GET" request to "/dummy_dates?dummyDate[after]=2015-04-28"
662662
Then the response status code should be 200
663663
And the response should be in JSON
@@ -666,7 +666,7 @@ Feature: Date filter on collections
666666
@dropSchema
667667
@createSchema
668668
Scenario: Get collection filtered by embedded date
669-
Given there is "2" embedded dummy objects with dummyDate and embeddedDummy
669+
Given there are 2 embedded dummy objects with dummyDate and embeddedDummy
670670
When I send a "GET" request to "/embedded_dummies?embeddedDummy.dummyDate[after]=2015-04-28"
671671
Then the response status code should be 200
672672
And the response should be in JSON

‎features/doctrine/exists_filter.feature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Feature: Exists filter on collections
55

66
@createSchema
77
Scenario: Get collection where exists does not exist
8-
Given there is "15" dummy objects with dummyBoolean true
8+
Given there are 15 dummy objects with dummyBoolean true
99
When I send a "GET" request to "/dummies?dummyBoolean[exists]=0"
1010
Then the response status code should be 200
1111
And the response should be in JSON

‎features/doctrine/multiple_filter.feature

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ Feature: Multiple filters on collections
66
@createSchema
77
@dropSchema
88
Scenario: Get collection filtered by multiple parameters
9-
Given there is "30" dummy objects with dummyDate and dummyBoolean true
10-
And there is "20" dummy objects with dummyDate and dummyBoolean false
9+
Given there are 30 dummy objects with dummyDate and dummyBoolean true
10+
And there are 20 dummy objects with dummyDate and dummyBoolean false
1111
When I send a "GET" request to "/dummies?dummyDate[after]=2015-04-28&dummyBoolean=1"
1212
Then the response status code should be 200
1313
And the response should be in JSON

‎features/doctrine/numeric_filter.feature

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Feature: Numeric filter on collections
55

66
@createSchema
77
Scenario: Get collection by dummyPrice=9.99
8-
Given there is "10" dummy objects with dummyPrice
8+
Given there are 10 dummy objects with dummyPrice
99
When I send a "GET" request to "/dummies?dummyPrice=9.99"
1010
Then the response status code should be 200
1111
And the response should be in JSON
@@ -49,7 +49,7 @@ Feature: Numeric filter on collections
4949

5050
@dropSchema
5151
Scenario: Get collection by non-numeric dummyPrice=marty
52-
Given there is "10" dummy objects with dummyPrice
52+
Given there are 10 dummy objects with dummyPrice
5353
When I send a "GET" request to "/dummies?dummyPrice=marty"
5454
Then the response status code should be 200
5555
And the response should be in JSON

‎features/doctrine/order_filter.feature

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Feature: Order filter on collections
55

66
@createSchema
77
Scenario: Get collection ordered in ascending order on an integer property and on which order filter has been enabled in whitelist mode
8-
Given there is "30" dummy objects
8+
Given there are 30 dummy objects
99
When I send a "GET" request to "/dummies?order[id]=asc"
1010
Then the response status code should be 200
1111
And the response should be in JSON
@@ -301,7 +301,7 @@ Feature: Order filter on collections
301301
"""
302302

303303
Scenario: Get collection ordered in ascending order on an association and on which order filter has been enabled in whitelist mode
304-
Given there is "30" dummy objects with relatedDummy
304+
Given there are 30 dummy objects with relatedDummy
305305
When I send a "GET" request to "/dummies?order[relatedDummy]=asc"
306306
Then the response status code should be 200
307307
And the response should be in JSON
@@ -361,7 +361,7 @@ Feature: Order filter on collections
361361
"""
362362

363363
Scenario: Get collection ordered in ascending order on an embedded and on which order filter has been enabled in whitelist mode
364-
Given there is "30" dummy objects with embeddedDummy
364+
Given there are 30 dummy objects with embeddedDummy
365365
When I send a "GET" request to "/embedded_dummies?order[embeddedDummy]=asc"
366366
Then the response status code should be 200
367367
And the response should be in JSON

‎features/doctrine/range_filter.feature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Feature: Range filter on collections
55

66
@createSchema
77
Scenario: Get collection filtered by range (between)
8-
Given there is "30" dummy objects with dummyPrice
8+
Given there are 30 dummy objects with dummyPrice
99
When I send a "GET" request to "/dummies?dummyPrice[between]=12.99..15.99"
1010
Then the response status code should be 200
1111
And the response should be in JSON

‎features/doctrine/search_filter.feature

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ Feature: Search filter on collections
6565
"""
6666

6767
Scenario: Search collection by name (partial)
68-
Given there is "30" dummy objects
68+
Given there are 30 dummy objects
6969
When I send a "GET" request to "/dummies?name=my"
7070
Then the response status code should be 200
7171
And the response should be in JSON
@@ -105,7 +105,7 @@ Feature: Search filter on collections
105105
"""
106106

107107
Scenario: Search collection by name (partial)
108-
Given there are "30" embedded dummy objects
108+
Given there are 30 embedded dummy objects
109109
When I send a "GET" request to "/embedded_dummies?embeddedDummy.dummyName=my"
110110
Then the response status code should be 200
111111
And the response should be in JSON
@@ -324,7 +324,7 @@ Feature: Search filter on collections
324324
@createSchema
325325
@dropSchema
326326
Scenario: Search related collection by name
327-
Given there is 3 dummy objects having each 3 relatedDummies
327+
Given there are 3 dummy objects having each 3 relatedDummies
328328
When I add "Accept" header equal to "application/hal+json"
329329
And I send a "GET" request to "/dummies?relatedDummies.name=RelatedDummy1"
330330
Then the response status code should be 200
@@ -336,7 +336,7 @@ Feature: Search filter on collections
336336

337337
@createSchema
338338
Scenario: Get collection by id equals 9.99 which is not possible
339-
Given there is "30" dummy objects
339+
Given there are 30 dummy objects
340340
When I send a "GET" request to "/dummies?id=9.99"
341341
Then the response status code should be 200
342342
And the response should be in JSON

‎features/hydra/collection.feature

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Feature: Collections support
2929
"""
3030

3131
Scenario: Retrieve the first page of a collection
32-
Given there is "30" dummy objects
32+
Given there are 30 dummy objects
3333
And I send a "GET" request to "/dummies"
3434
Then the response status code should be 200
3535
And the response should be in JSON
@@ -354,7 +354,7 @@ Feature: Collections support
354354

355355
@dropSchema
356356
@createSchema
357-
Scenario: Allow passing "0" to `itemsPerPage`
357+
Scenario: Allow passing 0 to `itemsPerPage`
358358
When I send a "GET" request to "/dummies?itemsPerPage=0"
359359
Then the response status code should be 200
360360
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/serializer/group_filter.feature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Feature: Filter with serialization groups on items and collections
55

66
@createSchema
77
Scenario: Get a collection of resources by group dummy_foo without overriding
8-
Given there is "10" dummy group objects
8+
Given there are 10 dummy group objects
99
When I send a "GET" request to "/dummy_groups?groups[]=dummy_foo"
1010
Then the response status code should be 200
1111
And the response should be in JSON

‎features/serializer/property_filter.feature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Feature: Filter with serialization attributes on items and collections
55

66
@createSchema
77
Scenario: Get a collection of resources by attributes id, foo and bar
8-
Given there is "10" dummy property objects
8+
Given there are 10 dummy property objects
99
When I send a "GET" request to "/dummy_properties?properties[]=id&properties[]=foo&properties[]=bar"
1010
Then the response status code should be 200
1111
And the response should be in JSON

0 commit comments

Comments
 (0)