|
- {{ form_widget(item.pizza) }}
+ {{ form_widget(item.pizza, { "empty_value": "" }) }}
{{ form_errors(item.pizza) }}
|
@@ -54,6 +54,7 @@
{{ form_rest(form) }}{# form.items's prototype is rendered twice #}
+ {{ form_errors(form) }}
diff --git a/Tests/Entity/AbstractEntityTest.php b/Tests/Entity/AbstractEntityTest.php
new file mode 100644
index 0000000..8a97a0c
--- /dev/null
+++ b/Tests/Entity/AbstractEntityTest.php
@@ -0,0 +1,21 @@
+boot();
+
+ self::$validator = $kernel->getContainer()->get('validator');
+ }
+}
diff --git a/Tests/Entity/CustomerEntityTest.php b/Tests/Entity/CustomerEntityTest.php
new file mode 100644
index 0000000..3c83b8c
--- /dev/null
+++ b/Tests/Entity/CustomerEntityTest.php
@@ -0,0 +1,59 @@
+ array(
+ 'name' => 'Patricia S. Kemp',
+ 'street' => '3347 Duck Creek Road',
+ 'city' => 'Palo Alto, CA 94306',
+ 'phone' => '650-813-0200',
+ ),
+ 'errors' => array(),
+ );
+
+ $data[] = array(
+ 'properties' => array(),
+ 'errors' => array(
+ 'name' => 'This value should not be blank',
+ 'street' => 'This value should not be blank',
+ 'city' => 'This value should not be blank',
+ 'phone' => 'This value should not be blank',
+ ),
+ );
+
+ return $data;
+ }
+
+ /**
+ * @dataProvider provider
+ */
+ public function testValidation(array $properties, array $errors)
+ {
+ $customer = new Customer();
+
+ foreach ($properties as $property => $value) {
+ $customer->set($property, $value);
+ }
+
+ $violations = self::$validator->validate($customer, array('Customer'));
+ /* @var $violations \Symfony\Component\Validator\ConstraintViolationList */
+
+ $this->assertEquals(count($errors), count($violations), (string) $violations);
+
+ foreach ($errors as $property => $message) {
+ $pattern = sprintf('/\.%s:\s+%s$/m', $property, $message);
+ $this->assertRegExp($pattern, (string) $violations, $violations);
+ }
+ }
+}
diff --git a/Tests/Entity/OrderEntityTest.php b/Tests/Entity/OrderEntityTest.php
new file mode 100644
index 0000000..dc576c9
--- /dev/null
+++ b/Tests/Entity/OrderEntityTest.php
@@ -0,0 +1,57 @@
+ array(
+ 'date' => new \DateTime(),
+ 'customer' => new Customer(),
+ 'items' => new ArrayCollection(),
+ ),
+ 'errors' => array(),
+ );
+
+ $data[] = array(
+ 'properties' => array(),
+ 'errors' => array(
+ 'customer' => 'This value should not be blank',
+ ),
+ );
+
+ return $data;
+ }
+
+ /**
+ * @dataProvider provider
+ */
+ public function testValidation(array $properties, array $errors)
+ {
+ $order = new Order();
+
+ foreach ($properties as $property => $value) {
+ $order->set($property, $value);
+ }
+
+ $violations = self::$validator->validate($order);
+ /* @var $violations \Symfony\Component\Validator\ConstraintViolationList */
+
+ $this->assertEquals(count($errors), count($violations), (string) $violations);
+
+ foreach ($errors as $property => $message) {
+ $pattern = sprintf('/\.%s:\s+%s$/m', $property, $message);
+ $this->assertRegExp($pattern, (string) $violations, $violations);
+ }
+ }
+}
diff --git a/Tests/Entity/OrderItemEntityTest.php b/Tests/Entity/OrderItemEntityTest.php
new file mode 100644
index 0000000..f2645db
--- /dev/null
+++ b/Tests/Entity/OrderItemEntityTest.php
@@ -0,0 +1,83 @@
+ array(
+ 'order' => $order = new Order(),
+ 'pizza' => $pizza = new Pizza(),
+ 'count' => 2,
+ ),
+ 'errors' => array(),
+ );
+
+ $data[] = array(
+ 'properties' => array(),
+ 'errors' => array(
+ //'order' => 'This value should not be blank',
+ 'pizza' => 'This value should not be blank',
+ 'count' => 'This value should not be blank',
+ ),
+ );
+
+ $data[] = array(
+ 'properties' => array(
+ 'order' => $order,
+ 'pizza' => $pizza,
+ 'count' => 0,
+ ),
+ 'errors' => array(
+ 'count' => 'This value should be 1 or more',
+ ),
+ );
+
+ $data[] = array(
+ 'properties' => array(
+ 'order' => $order,
+ 'pizza' => $pizza,
+ 'count' => 1.5,
+ ),
+ 'errors' => array(
+ 'count' => 'This value should be of type integer',
+ ),
+ );
+
+ return $data;
+ }
+
+ /**
+ * @dataProvider provider
+ */
+ public function testValidation(array $properties, array $errors)
+ {
+ $item = new OrderItem();
+
+ foreach ($properties as $property => $value) {
+ $item->set($property, $value);
+ }
+
+ $violations = self::$validator->validate($item);
+ /* @var $violations \Symfony\Component\Validator\ConstraintViolationList */
+
+ $this->assertEquals(count($errors), count($violations), (string) $violations);
+
+ foreach ($errors as $property => $message) {
+ $pattern = sprintf('/\.%s:\s+%s$/m', $property, $message);
+ $this->assertRegExp($pattern, (string) $violations, $violations);
+ }
+ }
+}
diff --git a/Tests/Entity/PizzaEntityTest.php b/Tests/Entity/PizzaEntityTest.php
new file mode 100644
index 0000000..b135255
--- /dev/null
+++ b/Tests/Entity/PizzaEntityTest.php
@@ -0,0 +1,84 @@
+ array(
+ 'name' => 'Big Sicilian',
+ 'price' => 13.40,
+ ),
+ 'errors' => array(),
+ );
+
+ $data[] = array(
+ 'properties' => array(
+ 'name' => 'Big Sicilian',
+ 'price' => '13.40',
+ ),
+ 'errors' => array(),
+ );
+
+ $data[] = array(
+ 'properties' => array(),
+ 'errors' => array(
+ 'name' => 'This value should not be blank',
+ 'price' => 'This value should not be blank',
+ ),
+ );
+
+ $data[] = array(
+ 'properties' => array(
+ 'name' => 'Big',
+ 'price' => 'azerty',
+ ),
+ 'errors' => array(
+ 'name' => 'This value is too short. It should have 5 characters or more',
+ 'price' => 'This value should be a valid number',
+ ),
+ );
+
+ $data[] = array(
+ 'properties' => array(
+ 'name' => 'Big Sicilian',
+ 'price' => -13.40,
+ ),
+ 'errors' => array(
+ 'price' => 'This value should be 2 or more',
+ ),
+ );
+
+ return $data;
+ }
+
+ /**
+ * @dataProvider provider
+ */
+ public function testValidation(array $properties, array $errors)
+ {
+ $pizza = new Pizza();
+
+ foreach ($properties as $property => $value) {
+ $pizza->set($property, $value);
+ }
+
+ $violations = self::$validator->validate($pizza);
+ /* @var $violations \Symfony\Component\Validator\ConstraintViolationList */
+
+ $this->assertEquals(count($errors), count($violations), (string) $violations);
+
+ foreach ($errors as $property => $message) {
+ $pattern = sprintf('/\.%s:\s+%s$/m', $property, $message);
+ $this->assertRegExp($pattern, (string) $violations, $violations);
+ }
+ }
+}
diff --git a/Tests/Selenium/OrderSeleniumTest.php b/Tests/Selenium/OrderSeleniumTest.php
index 063d033..3420d0d 100644
--- a/Tests/Selenium/OrderSeleniumTest.php
+++ b/Tests/Selenium/OrderSeleniumTest.php
@@ -173,33 +173,6 @@ public function testOrder4CreateWithKnowCustomerButCountIsZero()
$this->click("//input[@type='submit']");
$this->waitForPageToLoad(30000);
- $this->assertTrue($this->isTextPresent("You have to pick at least one pizza..."));
- }
-
- public function testOrder5CreateWithKnowCustomerButCountIsNegative()
- {
- $this->markTestSkipped();
-
- $order = array(
- 'known_phone' => '03.37.63.90.80',
- 'items' => array(
- array(
- 'pizza' => 'Sweet Potato(7.90)',
- 'count' => -1,
- ),
- ),
- );
-
- $url = $this->router->generate('acme_pizza_order_index');
-
- $this->open($url);
- $this->click ('order_known_customer');
- $this->type ('order_known_phone', $order['known_phone']);
- $this->select('order_items_0_pizza', 'label='.$order['items'][0]['pizza']);
- $this->type ('order_items_0_count', $order['items'][0]['count']);
- $this->click("//input[@type='submit']");
- $this->waitForPageToLoad(30000);
-
- $this->assertTrue($this->isTextPresent("You have to pick at least one pizza..."));
+ $this->assertTrue($this->isTextPresent("This value should not be blank"));
}
}
|