MC-33856: Stabilize Integration Tests

Author: DianaRusin

app/code/Magento/Captcha/Model/DefaultModel.php

@@ -496,12 +496,17 @@ public function getWord()
     /**
      * Get captcha words
      *
-     * @return string|null
+     * @return string
      */
     private function getWords()
     {
         $sessionData = $this->session->getData($this->getFormIdKey(self::SESSION_WORD));
-        return time() < $sessionData['expires'] ? $sessionData['words'] : null;
+        $words = '';
+        if (isset($sessionData['expires'], $sessionData['words']) && time() < $sessionData['expires']) {
+            $words = $sessionData['words'];
+        }
+
+        return $words;
     }
 
     /**

app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php

@@ -194,7 +194,10 @@ public function execute()
             $attributeCode = $model && $model->getId()
                 ? $model->getAttributeCode()
                 : $this->getRequest()->getParam('attribute_code');
-            $attributeCode = $attributeCode ?: $this->generateCode($this->getRequest()->getParam('frontend_label')[0]);
+            if (!$attributeCode) {
+                $frontendLabel = $this->getRequest()->getParam('frontend_label')[0] ?? '';
+                $attributeCode = $this->generateCode($frontendLabel);
+            }
             $data['attribute_code'] = $attributeCode;
 
             //validate frontend_input