Merge pull request #9 from Brille24/behat_fix

Behat fix
Brille24 · Aug 13, 2018 · 6301afe · 6301afe
2 parents 1811b16 + d33c5fd
commit 6301afe
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 16 deletions.
diff --git a/features/admin/customer_option_groups/configuring_validators.feature b/features/admin/customer_option_groups/configuring_validators.feature
@@ -159,8 +159,8 @@ Feature: Configuring validators
         Then the customer option group "Some Group" should have conditions:
             | option         | comparator | value            | error_message |
             | Text Option    | equal      | 5                | Oops          |
-            | Select Option  | in_set     | Value-1, Value-3 |               |
-            | Boolean Option | equal      | true             |               |
+            | Select Option  | in_set     | Value-1, Value-3 | Oops          |
+            | Boolean Option | equal      | true             | Oops          |
 
     @ui
     Scenario: Multiple constraints are saved correctly
@@ -187,10 +187,10 @@ Feature: Configuring validators
         And I save my changes
 
         Then the customer option group "Some Group" should have constraints:
-            | option            | comparator | value              | error_message |
-            | Text Option       | equal      | 5                  | Oops          |
-            | Select Option     | in_set     | "Value-1, Value-3" |               |
-            | Boolean Option    | equal      | true               |               |
+            | option         | comparator | value              | error_message |
+            | Text Option    | equal      | 5                  | Oops          |
+            | Select Option  | in_set     | "Value-1, Value-3" | Oops          |
+            | Boolean Option | equal      | true               | Oops          |
 
     @ui
     Scenario: Saving multiple validators
@@ -223,10 +223,10 @@ Feature: Configuring validators
         And I save my changes
 
         Then the customer option group "Some Group" should have conditions:
-            | condition_option | condition_comparator | condition_value | error_message |
-            |  Text Option     |  lesser              | 10              |  msg 1        |
-            |  Number Option   |  equal               | 10              |  msg 2        |
+            | option         | comparator | value | error_message |
+            |  Text Option   |  lesser    | 10    | msg 1         |
+            |  Number Option |  equal     | 10    | msg 2         |
 
-      And the customer option group "Some Group" should have constraints:
-            | option        | comparator | value | error_message |
-            | Text Option   | greater    | 10    | msg 3         |
+        And the customer option group "Some Group" should have constraints:
+            | option      | comparator | value | error_message |
+            | Text Option | greater    | 10    | msg 3         |
diff --git a/src/Form/Validator/ValueType.php b/src/Form/Validator/ValueType.php
@@ -42,7 +42,8 @@ function ($modelData) use ($options) {
                 if ($modelData !== null
                     && is_array($modelData)
                     && array_key_exists('type', $modelData)
-                    && $modelData['type'] === $newConfig['type']) {
+                    && $modelData['type'] === $newConfig['type']
+                ) {
                     $modelData = $modelData['value'];
                     $result = $modelData;
                 }
@@ -60,6 +61,8 @@ function ($modelData) use ($options) {
                         if (isset($modelData['timezone'])) {
                             $result->setTimezone(new \DateTimeZone($modelData['timezone']));
                         }
+                    } else {
+                        $result = $modelData;
                     }
                 }
 

diff --git a/tests/Behat/Context/Admin/CustomerOptionGroupsContext.php b/tests/Behat/Context/Admin/CustomerOptionGroupsContext.php
@@ -399,26 +399,45 @@ function (ValidatorInterface $validator) use ($conditionType): array {
             $flatConditionsToCheck = array_merge($flatConditionsToCheck, $conditionsArray);
         }
 
-        $result = false;
+        $result = true;
 
         foreach ($table->getHash() as $row) {
+            foreach ($row as $key => $value) {
+                $row[$key] = str_replace('"', '', $value);
+            }
+
+            $hasCondition = false;
+
             foreach ($flatConditionsToCheck as $condition) {
+                /** @var CustomerOptionInterface $customerOption */
                 $customerOption = $condition->getCustomerOption();
 
-                if ($customerOption->getName() == $row['option']) {
+                $optionName = $customerOption->getName();
+
+                if ($optionName == $row['option']) {
                     $val = $this->prepareValue($row['value'], $customerOption->getType());
 
+                    if (CustomerOptionTypeEnum::isSelect($customerOption->getType())) {
+                        foreach ($val as $key => $value) {
+                            $val[$key] = strtolower($value);
+                        }
+                    }
+
                     $sameComp = $condition->getComparator() == $row['comparator'];
                     $sameVal  = $this->values_are_equal(
                         $condition->getValue()['value'], $val, $customerOption->getType()
                     );
 
                     if ($sameComp && $sameVal) {
                         $expectedMessage = $row['error_message'];
-                        $result = $condition->getValidator()->getErrorMessage()->getMessage() === $expectedMessage;
+                        if ($condition->getValidator()->getErrorMessage()->getMessage() === $expectedMessage) {
+                            $hasCondition = true;
+                        }
                     }
                 }
             }
+
+            $result = $result && $hasCondition;
         }
 
         Assert::true($result, 'The validator does not contain the condition');