MTA-1679: Sync qmt repository with mainline - Sprint 8

Dmytro Aponasenko · Dmytro Aponasenko · commit 293e6fe6e46c · 2015-03-14T14:25:23.000+02:00
diff --git a/dev/tests/functional/lib/Magento/Mtf/Fixture/DataSource.php b/dev/tests/functional/lib/Magento/Mtf/Fixture/DataSource.php
@@ -9,7 +9,7 @@
 use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
- * Parent fixture data source clsss.
+ * Parent fixture data source class.
  */
 class DataSource implements FixtureInterface
 {
@@ -51,9 +51,9 @@ public function getData($key = null)
     }
 
     /**
-     * Return data set configuration settings
+     * Return data set configuration settings.
      *
-     * @return string
+     * @return array
      */
     public function getDataConfig()
     {
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Handler/Role/Curl.php b/dev/tests/functional/tests/app/Magento/User/Test/Handler/Role/Curl.php
@@ -124,7 +124,7 @@ protected function prepareAssignedUsers(FixtureInterface $fixture)
 
     // TODO: Method should be removed in scope of  MAGETWO-31563
     /**
-     * Prepare admin gws option
+     * Prepare admin gws option.
      *
      * @param array $data
      * @return array

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`use Magento\Mtf\Fixture\FixtureInterface;`
`10`	`10`
`11`	`11`	`/**`
`12`		`- * Parent fixture data source clsss.`
	`12`	`+ * Parent fixture data source class.`
`13`	`13`	`*/`
`14`	`14`	`class DataSource implements FixtureInterface`
`15`	`15`	`{`
`@@ -51,9 +51,9 @@ public function getData($key = null)`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`/**`
`54`		`- * Return data set configuration settings`
	`54`	`+ * Return data set configuration settings.`
`55`	`55`	`*`
`56`		`- * @return string`
	`56`	`+ * @return array`
`57`	`57`	`*/`
`58`	`58`	`public function getDataConfig()`
`59`	`59`	`{`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ protected function prepareAssignedUsers(FixtureInterface $fixture)`
`124`	`124`
`125`	`125`	`// TODO: Method should be removed in scope of MAGETWO-31563`
`126`	`126`	`/**`
`127`		`- * Prepare admin gws option`
	`127`	`+ * Prepare admin gws option.`
`128`	`128`	`*`
`129`	`129`	`* @param array $data`
`130`	`130`	`* @return array`