MAGETWO-65736: Swatch attributes are not shown on category page

Author: zakdma

dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/DataGrid.php

@@ -329,9 +329,11 @@ public function selectMassAction($massActionSelection)
             $massActionList = '(' . $this->massActionToggleList . ")[$i]";
             if ($this->_rootElement->find($massActionButton, Locator::SELECTOR_XPATH)->isVisible()) {
                 $this->_rootElement->find($massActionButton, Locator::SELECTOR_XPATH)->click();
-                $this->_rootElement
-                    ->find(sprintf($massActionList, $massActionSelection), Locator::SELECTOR_XPATH)
-                    ->click();
+                $element = $this->_rootElement
+                    ->find(sprintf($massActionList, $massActionSelection), Locator::SELECTOR_XPATH);
+                if ($element->isVisible()) {
+                    $element->click();
+                }
                 break;
             }
         }

dev/tests/functional/utils/command.php

@@ -12,7 +12,7 @@
 
 if (isset($_GET['command'])) {
     $command = urldecode($_GET['command']);
-    if (in_array($command, $commandList)) {
+    if (in_array(explode(' ', $command)[0], $commandList)) {
         exec('php -f ../../../../bin/magento ' . $command);
     }
 } else {