Merge branch 'MAGETWO-61889-upgrade-tests' of github.com:magento-fearless-kiwis/magento2ce into MAGETWO-61889-upgrade-tests

Author: cpartica

dev/tests/functional/etc/events.xml

@@ -47,9 +47,7 @@
         <observer class="Magento\Mtf\System\Observer\Screenshot">
             <tag name="exception"/>
             <tag name="failure"/>
-            <tag name="click_before"/>
             <tag name="click_after"/>
-            <tag name="set_value"/>
             <tag name="accept_alert_after"/>
             <tag name="dismiss_alert_after"/>
             <tag name="open_after"/>
@@ -59,9 +57,7 @@
         <observer class="Magento\Mtf\System\Observer\SourceCode">
             <tag name="exception"/>
             <tag name="failure"/>
-            <tag name="click_before"/>
             <tag name="click_after"/>
-            <tag name="set_value"/>
             <tag name="accept_alert_after"/>
             <tag name="dismiss_alert_after"/>
             <tag name="open_after"/>

dev/tests/functional/tests/app/Magento/Upgrade/Test/Block/SelectVersion.php

@@ -10,6 +10,7 @@
 use Magento\Mtf\Client\Element\SimpleElement;
 use Magento\Mtf\Client\Locator;
 use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Client\ElementInterface;
 
 /**
  * Select version block.
@@ -84,7 +85,7 @@ public function chooseVersionUpgradeOtherComponents($sampleDataVersion)
     /**
      * Gets components rows as ElementInterface
      *
-     * @return \Magento\Mtf\Client\ElementInterface[]
+     * @return ElementInterface[]
      */
     private function getComponentsTableRows()
     {
@@ -136,7 +137,7 @@ private function canClickOnNextPage()
      * Gets rows component title
      *
      * @param int $rowIndex
-     * @return \Magento\Mtf\Client\ElementInterface
+     * @return ElementInterface
      */
     private function getRowComponentTitle($rowIndex)
     {
@@ -150,7 +151,7 @@ private function getRowComponentTitle($rowIndex)
      * Gets the select element from row
      *
      * @param int $rowIndex
-     * @return \Magento\Mtf\Client\ElementInterface
+     * @return ElementInterface
      */
     private function getSelectFromRow($rowIndex)
     {
@@ -180,7 +181,7 @@ private function convertVersionFixtureToRegexp($sampleDataVersion)
     /**
      * Asserts if element's text contains sample data
      *
-     * @param \Magento\Mtf\Client\ElementInterface $element
+     * @param ElementInterface $element
      * @return bool
      */
     private function titleContainsSampleData($element)