Fix functional tests.

dev/tests/functional/lib/Magento/Mtf/Client/Element/ConditionsElement.php

@@ -265,7 +265,7 @@ protected function addSingleCondition($condition, ElementInterface $context)
         $this->addCondition($condition['type'], $context);
         $createdCondition = $context->find($this->created, Locator::SELECTOR_XPATH);
         $this->waitForCondition($createdCondition);
-        $this->fillCondition($condition['rules'], $createdCondition);
+        $this->fillCondition($condition['rules'], $createdCondition, $condition['type']);
     }
 
     /**
@@ -306,13 +306,14 @@ protected function addCondition($type, ElementInterface $context)
      *
      * @param array $rules
      * @param ElementInterface $element
+     * @param string|null $type
      * @return void
      * @throws \Exception
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
-    protected function fillCondition(array $rules, ElementInterface $element)
+    protected function fillCondition(array $rules, ElementInterface $element, $type = null)
     {
         $this->resetKeyParam();
         foreach ($rules as $rule) {
@@ -333,7 +334,7 @@ protected function fillCondition(array $rules, ElementInterface $element)
 
                     if ($this->fillGrid($rule, $param)) {
                         $isSet = true;
-                    } elseif ($this->fillSelect($rule, $param)) {
+                    } elseif ($this->fillSelect($rule, $param, $type)) {
                         $isSet = true;
                     } elseif ($this->fillText($rule, $param)) {
                         $isSet = true;
@@ -390,11 +391,15 @@ protected function fillGrid($rule, ElementInterface $param)
      *
      * @param string $rule
      * @param ElementInterface $param
+     * @param string|null $type
      * @return bool
      */
-    protected function fillSelect($rule, ElementInterface $param)
+    protected function fillSelect($rule, ElementInterface $param, $type = null)
     {
-        $value = $param->find('select', Locator::SELECTOR_TAG_NAME, 'select');
+        //Avoid confusion between regions like: "Baja California" and "California".
+        $value = $type === 'Shipping State/Province'
+            ? $param->find('select', Locator::SELECTOR_TAG_NAME, 'selectstate')
+            : $param->find('select', Locator::SELECTOR_TAG_NAME, 'select');
         if ($value->isVisible()) {
             $value->setValue($rule);
             $this->click();

dev/tests/functional/lib/Magento/Mtf/Client/Element/SelectstateElement.php

@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Mtf\Client\Element;
+
+/**
+ * @inheritdoc
+ */
+class SelectstateElement extends SelectElement
+{
+    /**
+     * @inheritdoc
+     */
+    protected $optionByValue = './/option[normalize-space(.)=%s]';
+}