Skip to content

Commit

Permalink
Merge pull request #48 from magento-firedrakes/MAGETWO-32081-2
Browse files Browse the repository at this point in the history 
[Firedrakes] Magento vendor name is used as a framework namespace
  • Loading branch information
Michael Logvin committed Jan 22, 2015
2 parents 2410622 + 4445ff2 commit 3dd6f78
Show file tree
Hide file tree
Showing 1,144 changed files with 2,102 additions and 2,085 deletions.
2 changes: 1 addition & 1 deletion dev/tests/functional/.gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
!/config/isolation.yml.dist
!/config/server.yml.dist
phpunit.xml
/lib/Mtf/Util/Generate/testcase.xml
/lib/Magento/Mtf/Util/Generate/testcase.xml
5 changes: 2 additions & 3 deletions dev/tests/functional/composer.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"require": {
"magento/mtf": "1.0.0-rc13",
"magento/mtf": "1.0.0-rc14",
"php": ">=5.4.0",
"phpunit/phpunit": "4.1.0",
"phpunit/phpunit-selenium": ">=1.2",
Expand All @@ -11,8 +11,7 @@
},
"autoload": {
"psr-4": {
"Mtf\\": ["lib/Mtf/", "generated/Mtf/", "testsuites/Mtf/"],
"Magento\\": ["generated/Magento/", "tests/app/Magento/"],
"Magento\\": ["lib/Magento/", "testsuites/Magento", "generated/Magento/", "tests/app/Magento/"],
"Test\\": "generated/Test/"
}
}
Expand Down
6 changes: 4 additions & 2 deletions dev/tests/functional/composer.json.dist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,12 @@
"phpunit/phpunit-selenium": ">=1.2",
"netwing/selenium-server-standalone": ">=2.35"
},
"suggest": {
"facebook/webdriver": "dev-master"
},
"autoload": {
"psr-4": {
"Mtf\\": ["lib/Mtf/", "generated/Mtf/", "testsuites/Mtf/"],
"Magento\\": ["generated/Magento/", "tests/app/Magento/"],
"Magento\\": ["lib/Magento/", "testsuites/Magento", "generated/Magento/", "tests/app/Magento/"],
"Test\\": "generated/Test/"
}
}
Expand Down
4 changes: 2 additions & 2 deletions dev/tests/functional/etc/global/di.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
<preference for="Mtf\Util\Generate\Fixture\FieldsProviderInterface" type="Mtf\Util\Generate\Fixture\FieldsProvider" />
<preference for="Mtf\Util\Generate\Repository\CollectionProviderInterface" type="Mtf\Util\Generate\Repository\CollectionProvider" />
<preference for="Magento\Mtf\Util\Generate\Fixture\FieldsProviderInterface" type="Magento\Mtf\Util\Generate\Fixture\FieldsProvider" />
<preference for="Magento\Mtf\Util\Generate\Repository\CollectionProviderInterface" type="Magento\Mtf\Util\Generate\Repository\CollectionProvider" />
</config>
5 changes: 3 additions & 2 deletions ...ional/lib/Mtf/App/State/AbstractState.php → ...b/Magento/Mtf/App/State/AbstractState.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* See COPYING.txt for license details.
*/

namespace Mtf\App\State;
namespace Magento\Mtf\App\State;

use Magento\Framework\App\DeploymentConfig\DbConfig;
use Magento\Framework\App\Filesystem\DirectoryList;
Expand Down Expand Up @@ -39,7 +39,8 @@ public function apply()
*/
public function clearInstance()
{
$dirList = \Mtf\ObjectManagerFactory::getObjectManager()->get('Magento\Framework\Filesystem\DirectoryList');
$dirList = \Magento\Mtf\ObjectManagerFactory::getObjectManager()
->get('Magento\Framework\Filesystem\DirectoryList');
$deploymentConfig = new \Magento\Framework\App\DeploymentConfig(
new \Magento\Framework\App\DeploymentConfig\Reader($dirList),
[]
Expand Down
6 changes: 3 additions & 3 deletions ...s/functional/lib/Mtf/App/State/State1.php → ...onal/lib/Magento/Mtf/App/State/State1.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
* See COPYING.txt for license details.
*/

namespace Mtf\App\State;
namespace Magento\Mtf\App\State;

use Mtf\ObjectManager;
use Mtf\Fixture\FixtureFactory;
use Magento\Mtf\ObjectManager;
use Magento\Mtf\Fixture\FixtureFactory;
use Magento\Core\Test\Fixture\ConfigData;

/**
Expand Down
8 changes: 4 additions & 4 deletions .../Mtf/Client/Element/ConditionsElement.php → .../Mtf/Client/Element/ConditionsElement.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
* See COPYING.txt for license details.
*/

namespace Mtf\Client\Element;
namespace Magento\Mtf\Client\Element;

use Mtf\ObjectManager;
use Mtf\Client\Locator;
use Mtf\Client\ElementInterface;
use Magento\Mtf\ObjectManager;
use Magento\Mtf\Client\Locator;
use Magento\Mtf\Client\ElementInterface;

/**
* Class ConditionsElement
Expand Down
4 changes: 2 additions & 2 deletions .../Mtf/Client/Element/DatepickerElement.php → .../Mtf/Client/Element/DatepickerElement.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
* See COPYING.txt for license details.
*/

namespace Mtf\Client\Element;
namespace Magento\Mtf\Client\Element;

use Mtf\Client\Locator;
use Magento\Mtf\Client\Locator;

/**
* General class for datepicker elements.
Expand Down
6 changes: 3 additions & 3 deletions ...tf/Client/Element/GlobalsearchElement.php → ...tf/Client/Element/GlobalsearchElement.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
* See COPYING.txt for license details.
*/

namespace Mtf\Client\Element;
namespace Magento\Mtf\Client\Element;

use Mtf\Client\Locator;
use Mtf\Client\ElementInterface;
use Magento\Mtf\Client\Locator;
use Magento\Mtf\Client\ElementInterface;

/**
* Typified element class for global search element.
Expand Down
4 changes: 2 additions & 2 deletions .../Mtf/Client/Element/JquerytreeElement.php → .../Mtf/Client/Element/JquerytreeElement.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
* See COPYING.txt for license details.
*/

namespace Mtf\Client\Element;
namespace Magento\Mtf\Client\Element;

use Mtf\Client\ElementInterface;
use Magento\Mtf\Client\ElementInterface;

/**
* Class JquerytreeElement
Expand Down
4 changes: 2 additions & 2 deletions ...f/Client/Element/LiselectstoreElement.php → ...f/Client/Element/LiselectstoreElement.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
* See COPYING.txt for license details.
*/

namespace Mtf\Client\Element;
namespace Magento\Mtf\Client\Element;

use Mtf\Client\Locator;
use Magento\Mtf\Client\Locator;

/**
* Class LiselectstoreElement
Expand Down
6 changes: 3 additions & 3 deletions ...t/Element/MultiselectgrouplistElement.php → ...t/Element/MultiselectgrouplistElement.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
* See COPYING.txt for license details.
*/

namespace Mtf\Client\Element;
namespace Magento\Mtf\Client\Element;

use Mtf\Client\Locator;
use Mtf\Client\ElementInterface;
use Magento\Mtf\Client\Locator;
use Magento\Mtf\Client\ElementInterface;

/**
* Class MultiselectgrouplistElement
Expand Down
10 changes: 5 additions & 5 deletions ...Client/Element/MultiselectlistElement.php → ...Client/Element/MultiselectlistElement.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
* See COPYING.txt for license details.
*/

namespace Mtf\Client\Element;
namespace Magento\Mtf\Client\Element;

use Mtf\Client\Locator;
use Magento\Mtf\Client\Locator;

/**
* Typified element class for Multiple Select List elements
Expand Down Expand Up @@ -39,7 +39,7 @@ public function setValue($values)
$values = is_array($values) ? $values : [$values];

foreach ($options as $option) {
/** @var \Mtf\Client\ElementInterface $option */
/** @var \Magento\Mtf\Client\ElementInterface $option */
$optionText = $option->getText();
$isChecked = $option->find($this->optionCheckedElement, Locator::SELECTOR_XPATH)->isVisible();
$inArray = in_array($optionText, $values);
Expand All @@ -60,7 +60,7 @@ public function getValue()
$options = $this->getOptions();

foreach ($options as $option) {
/** @var \Mtf\Client\ElementInterface $option */
/** @var \Magento\Mtf\Client\ElementInterface $option */
$checkedOption = $option->find($this->optionCheckedElement, Locator::SELECTOR_XPATH);
if ($checkedOption->isVisible()) {
$checkedOptions[] = $checkedOption->getText();
Expand Down Expand Up @@ -101,7 +101,7 @@ public function getAllValues()
$options = $this->getOptions();

foreach ($options as $option) {
/** @var \Mtf\Client\ElementInterface $option */
/** @var \Magento\Mtf\Client\ElementInterface $option */
$optionsValue[] = $option->getText();
}

Expand Down
6 changes: 3 additions & 3 deletions ...tf/Client/Element/MultisuggestElement.php → ...tf/Client/Element/MultisuggestElement.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
* See COPYING.txt for license details.
*/

namespace Mtf\Client\Element;
namespace Magento\Mtf\Client\Element;

use Mtf\Client\Locator;
use Magento\Mtf\Client\Locator;

/**
* Typified element class for multi suggest element.
Expand Down Expand Up @@ -73,7 +73,7 @@ public function getValue()
$values = [];

foreach ($choices as $choice) {
/** @var \Mtf\Client\ElementInterface $choice */
/** @var \Magento\Mtf\Client\ElementInterface $choice */
$values[] = $choice->getText();
}
return $values;
Expand Down
4 changes: 2 additions & 2 deletions .../Client/Element/OptgroupselectElement.php → .../Client/Element/OptgroupselectElement.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
* See COPYING.txt for license details.
*/

namespace Mtf\Client\Element;
namespace Magento\Mtf\Client\Element;

use Mtf\Client\Locator;
use Magento\Mtf\Client\Locator;

/**
* Class OptgroupselectElement
Expand Down
4 changes: 2 additions & 2 deletions ...Mtf/Client/Element/SelectstoreElement.php → ...Mtf/Client/Element/SelectstoreElement.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
* See COPYING.txt for license details.
*/

namespace Mtf\Client\Element;
namespace Magento\Mtf\Client\Element;

use Mtf\Client\Locator;
use Magento\Mtf\Client\Locator;

/**
* Typified element class for option group selectors.
Expand Down
4 changes: 2 additions & 2 deletions ...lib/Mtf/Client/Element/SuggestElement.php → ...nto/Mtf/Client/Element/SuggestElement.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
* See COPYING.txt for license details.
*/

namespace Mtf\Client\Element;
namespace Magento\Mtf\Client\Element;

use Mtf\Client\Locator;
use Magento\Mtf\Client\Locator;

/**
* Class SuggestElement
Expand Down
4 changes: 2 additions & 2 deletions ...unctional/lib/Mtf/Client/Element/Tree.php → ...l/lib/Magento/Mtf/Client/Element/Tree.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
* See COPYING.txt for license details.
*/

namespace Mtf\Client\Element;
namespace Magento\Mtf\Client\Element;

use Mtf\Client\ElementInterface;
use Magento\Mtf\Client\ElementInterface;

/**
* Class Tree
Expand Down
2 changes: 1 addition & 1 deletion ...al/lib/Mtf/Client/Element/TreeElement.php → ...agento/Mtf/Client/Element/TreeElement.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* See COPYING.txt for license details.
*/

namespace Mtf\Client\Element;
namespace Magento\Mtf\Client\Element;

/**
* Class TreeElement
Expand Down
2 changes: 1 addition & 1 deletion ...lib/Mtf/Constraint/AbstractAssertForm.php → ...nto/Mtf/Constraint/AbstractAssertForm.php
100755 → 100644
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* See COPYING.txt for license details.
*/

namespace Mtf\Constraint;
namespace Magento\Mtf\Constraint;

/**
* Class AssertForm
Expand Down
6 changes: 3 additions & 3 deletions ...ctional/lib/Mtf/EntryPoint/EntryPoint.php → ...lib/Magento/Mtf/EntryPoint/EntryPoint.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
* See COPYING.txt for license details.
*/

namespace Mtf\EntryPoint;
namespace Magento\Mtf\EntryPoint;

use Mtf\ObjectManager;
use Magento\Mtf\ObjectManager;

/**
* Class EntryPoint
Expand Down Expand Up @@ -60,7 +60,7 @@ public function run($applicationName, array $arguments = [])
{
try {
if (!$this->_locator) {
$locatorFactory = new \Mtf\ObjectManagerFactory();
$locatorFactory = new \Magento\Mtf\ObjectManagerFactory();
$this->_locator = $locatorFactory->create();
}
return $this->_locator->create($applicationName, $arguments)->launch();
Expand Down
Loading

0 comments on commit 3dd6f78

Please sign in to comment.