Merge pull request #1640 from dunglas/english-fixes

soyuka · web-flow · commit 7babd6acd882 · 2018-01-11T09:48:41.000+01:00
English fixes in tests
diff --git a/features/bootstrap/FeatureContext.php b/features/bootstrap/FeatureContext.php
@@ -102,7 +102,7 @@ public function dropDatabase()
     }
 
     /**
-     * @Given there is :nb dummy objects
+     * @Given there are :nb dummy objects
      */
     public function thereIsDummyObjects(int $nb)
     {
@@ -122,7 +122,7 @@ public function thereIsDummyObjects(int $nb)
     }
 
     /**
-     * @Given there is :nb dummy objects with relatedDummy
+     * @Given there are :nb dummy objects with relatedDummy
      */
     public function thereIsDummyObjectsWithRelatedDummy(int $nb)
     {
@@ -143,7 +143,7 @@ public function thereIsDummyObjectsWithRelatedDummy(int $nb)
     }
 
     /**
-     * @Given there is :nb dummy objects having each :nbrelated relatedDummies
+     * @Given there are :nb dummy objects having each :nbrelated relatedDummies
      */
     public function thereIsDummyObjectsWithRelatedDummies(int $nb, int $nbrelated)
     {
@@ -168,7 +168,7 @@ public function thereIsDummyObjectsWithRelatedDummies(int $nb, int $nbrelated)
     }
 
     /**
-     * @Given there is :nb dummy objects with dummyDate
+     * @Given there are :nb dummy objects with dummyDate
      */
     public function thereIsDummyObjectsWithDummyDate(int $nb)
     {
@@ -194,7 +194,7 @@ public function thereIsDummyObjectsWithDummyDate(int $nb)
     }
 
     /**
-     * @Given there is :nb dummy objects with dummyDate and dummyBoolean :bool
+     * @Given there are :nb dummy objects with dummyDate and dummyBoolean :bool
      */
     public function thereIsDummyObjectsWithDummyDateAndDummyBoolean(int $nb, string $bool)
     {
@@ -230,7 +230,7 @@ public function thereIsDummyObjectsWithDummyDateAndDummyBoolean(int $nb, string
     }
 
     /**
-     * @Given there is :nb dummy objects with dummyDate and relatedDummy
+     * @Given there are :nb dummy objects with dummyDate and relatedDummy
      */
     public function thereIsDummyObjectsWithDummyDateAndRelatedDummy(int $nb)
     {
@@ -258,7 +258,7 @@ public function thereIsDummyObjectsWithDummyDateAndRelatedDummy(int $nb)
     }
 
     /**
-     * @Given there is :nb dummy objects with dummyPrice
+     * @Given there are :nb dummy objects with dummyPrice
      */
     public function thereIsDummyObjectsWithDummyPrice(int $nb)
     {
@@ -279,7 +279,7 @@ public function thereIsDummyObjectsWithDummyPrice(int $nb)
     }
 
     /**
-     * @Given there is :nb dummy objects with dummyBoolean :bool
+     * @Given there are :nb dummy objects with dummyBoolean :bool
      */
     public function thereIsDummyObjectsWithDummyBoolean(int $nb, string $bool)
     {
diff --git a/features/doctrine/boolean_filter.feature b/features/doctrine/boolean_filter.feature
@@ -5,8 +5,8 @@ Feature: Boolean filter on collections
 
   @createSchema
   Scenario: Get collection by dummyBoolean true
-    Given there is "15" dummy objects with dummyBoolean true
-    And there is "10" dummy objects with dummyBoolean false
+    Given there are "15" dummy objects with dummyBoolean true
+    And there are "10" dummy objects with dummyBoolean false
     When I send a "GET" request to "/dummies?dummyBoolean=true"
     Then the response status code should be 200
     And the response should be in JSON
diff --git a/features/doctrine/date_filter.feature b/features/doctrine/date_filter.feature
@@ -5,7 +5,7 @@ Feature: Date filter on collections
 
   @createSchema
   Scenario: Get collection filtered by date
-    Given there is "30" dummy objects with dummyDate
+    Given there are 30 dummy objects with dummyDate
     When I send a "GET" request to "/dummies?dummyDate[after]=2015-04-28"
     Then the response status code should be 200
     And the response should be in JSON
@@ -266,7 +266,7 @@ Feature: Date filter on collections
 
   @dropSchema
   Scenario: Get collection filtered by association date
-    Given there is "30" dummy objects with dummyDate and relatedDummy
+    Given there are 30 dummy objects with dummyDate and relatedDummy
     When I send a "GET" request to "/dummies?relatedDummy.dummyDate[after]=2015-04-28"
     Then the response status code should be 200
     And the response should be in JSON
@@ -387,7 +387,7 @@ Feature: Date filter on collections
   @dropSchema
   @createSchema
   Scenario: Get collection filtered by association date
-    Given there is "2" dummy objects with dummyDate and relatedDummy
+    Given there are 2 dummy objects with dummyDate and relatedDummy
     When I send a "GET" request to "/dummies?relatedDummy.dummyDate[after]=2015-04-28"
     Then the response status code should be 200
     And the response should be in JSON
diff --git a/features/doctrine/multiple_filter.feature b/features/doctrine/multiple_filter.feature
@@ -6,8 +6,8 @@ Feature: Multiple filters on collections
   @createSchema
   @dropSchema
   Scenario: Get collection filtered by multiple parameters
-    Given there is "30" dummy objects with dummyDate and dummyBoolean true
-    And there is "20" dummy objects with dummyDate and dummyBoolean false
+    Given there are 30 dummy objects with dummyDate and dummyBoolean true
+    And there are 20 dummy objects with dummyDate and dummyBoolean false
     When I send a "GET" request to "/dummies?dummyDate[after]=2015-04-28&dummyBoolean=1"
     Then the response status code should be 200
     And the response should be in JSON
diff --git a/features/doctrine/numeric_filter.feature b/features/doctrine/numeric_filter.feature
@@ -5,7 +5,7 @@ Feature: Numeric filter on collections
 
   @createSchema
   Scenario: Get collection by id equals 9.99 which is not possible
-    Given there is "30" dummy objects
+    Given there are 30 dummy objects
     When I send a "GET" request to "/dummies?id=9.99"
     Then the response status code should be 200
     And the response should be in JSON
diff --git a/features/doctrine/order_filter.feature b/features/doctrine/order_filter.feature
@@ -5,7 +5,7 @@ Feature: Order filter on collections
 
   @createSchema
   Scenario: Get collection ordered in ascending order on an integer property and on which order filter has been enabled in whitelist mode
-    Given there is "30" dummy objects
+    Given there are 30 dummy objects
     When I send a "GET" request to "/dummies?order[id]=asc"
     Then the response status code should be 200
     And the response should be in JSON
@@ -301,7 +301,7 @@ Feature: Order filter on collections
     """
 
   Scenario: Get collection ordered in ascending order on an association and on which order filter has been enabled in whitelist mode
-    Given there is "30" dummy objects with relatedDummy
+    Given there are 30 dummy objects with relatedDummy
     When I send a "GET" request to "/dummies?order[relatedDummy]=asc"
     Then the response status code should be 200
     And the response should be in JSON
diff --git a/features/doctrine/range_filter.feature b/features/doctrine/range_filter.feature
@@ -5,7 +5,7 @@ Feature: Range filter on collections
 
   @createSchema
   Scenario: Get collection filtered by range (between)
-    Given there is "30" dummy objects with dummyPrice
+    Given there are 30 dummy objects with dummyPrice
     When I send a "GET" request to "/dummies?dummyPrice[between]=12.99..15.99"
     Then the response status code should be 200
     And the response should be in JSON
diff --git a/features/doctrine/search_filter.feature b/features/doctrine/search_filter.feature
@@ -65,7 +65,7 @@ Feature: Search filter on collections
     """
 
   Scenario: Search collection by name (partial)
-    Given there is "30" dummy objects
+    Given there are 30 dummy objects
     When I send a "GET" request to "/dummies?name=my"
     Then the response status code should be 200
     And the response should be in JSON
@@ -242,7 +242,7 @@ Feature: Search filter on collections
   @createSchema
   @dropSchema
   Scenario: Search related collection by name
-    Given there is 3 dummy objects having each 3 relatedDummies
+    Given there are 3 dummy objects having each 3 relatedDummies
     When I add "Accept" header equal to "application/hal+json"
     And I send a "GET" request to "/dummies?relatedDummies.name=RelatedDummy1"
     Then the response status code should be 200
diff --git a/features/hydra/collection.feature b/features/hydra/collection.feature
@@ -32,7 +32,7 @@ Feature: Collections support
     """
 
   Scenario: Retrieve the first page of a collection
-    Given there is "30" dummy objects
+    Given there are "30" dummy objects
     And I send a "GET" request to "/dummies"
     Then the response status code should be 200
     And the response should be in JSON

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ public function dropDatabase()`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`/**`
`105`		`- * @Given there is :nb dummy objects`
	`105`	`+ * @Given there are :nb dummy objects`
`106`	`106`	`*/`
`107`	`107`	`public function thereIsDummyObjects(int $nb)`
`108`	`108`	`{`
`@@ -122,7 +122,7 @@ public function thereIsDummyObjects(int $nb)`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`/**`
`125`		`- * @Given there is :nb dummy objects with relatedDummy`
	`125`	`+ * @Given there are :nb dummy objects with relatedDummy`
`126`	`126`	`*/`
`127`	`127`	`public function thereIsDummyObjectsWithRelatedDummy(int $nb)`
`128`	`128`	`{`
`@@ -143,7 +143,7 @@ public function thereIsDummyObjectsWithRelatedDummy(int $nb)`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`/**`
`146`		`- * @Given there is :nb dummy objects having each :nbrelated relatedDummies`
	`146`	`+ * @Given there are :nb dummy objects having each :nbrelated relatedDummies`
`147`	`147`	`*/`
`148`	`148`	`public function thereIsDummyObjectsWithRelatedDummies(int $nb, int $nbrelated)`
`149`	`149`	`{`
`@@ -168,7 +168,7 @@ public function thereIsDummyObjectsWithRelatedDummies(int $nb, int $nbrelated)`
`168`	`168`	`}`
`169`	`169`
`170`	`170`	`/**`
`171`		`- * @Given there is :nb dummy objects with dummyDate`
	`171`	`+ * @Given there are :nb dummy objects with dummyDate`
`172`	`172`	`*/`
`173`	`173`	`public function thereIsDummyObjectsWithDummyDate(int $nb)`
`174`	`174`	`{`
`@@ -194,7 +194,7 @@ public function thereIsDummyObjectsWithDummyDate(int $nb)`
`194`	`194`	`}`
`195`	`195`
`196`	`196`	`/**`
`197`		`- * @Given there is :nb dummy objects with dummyDate and dummyBoolean :bool`
	`197`	`+ * @Given there are :nb dummy objects with dummyDate and dummyBoolean :bool`
`198`	`198`	`*/`
`199`	`199`	`public function thereIsDummyObjectsWithDummyDateAndDummyBoolean(int $nb, string $bool)`
`200`	`200`	`{`
`@@ -230,7 +230,7 @@ public function thereIsDummyObjectsWithDummyDateAndDummyBoolean(int $nb, string`
`230`	`230`	`}`
`231`	`231`
`232`	`232`	`/**`
`233`		`- * @Given there is :nb dummy objects with dummyDate and relatedDummy`
	`233`	`+ * @Given there are :nb dummy objects with dummyDate and relatedDummy`
`234`	`234`	`*/`
`235`	`235`	`public function thereIsDummyObjectsWithDummyDateAndRelatedDummy(int $nb)`
`236`	`236`	`{`
`@@ -258,7 +258,7 @@ public function thereIsDummyObjectsWithDummyDateAndRelatedDummy(int $nb)`
`258`	`258`	`}`
`259`	`259`
`260`	`260`	`/**`
`261`		`- * @Given there is :nb dummy objects with dummyPrice`
	`261`	`+ * @Given there are :nb dummy objects with dummyPrice`
`262`	`262`	`*/`
`263`	`263`	`public function thereIsDummyObjectsWithDummyPrice(int $nb)`
`264`	`264`	`{`
`@@ -279,7 +279,7 @@ public function thereIsDummyObjectsWithDummyPrice(int $nb)`
`279`	`279`	`}`
`280`	`280`
`281`	`281`	`/**`
`282`		`- * @Given there is :nb dummy objects with dummyBoolean :bool`
	`282`	`+ * @Given there are :nb dummy objects with dummyBoolean :bool`
`283`	`283`	`*/`
`284`	`284`	`public function thereIsDummyObjectsWithDummyBoolean(int $nb, string $bool)`
`285`	`285`	`{`