Skip to content

Commit

Permalink
Merge pull request #2047 from magento-pangolin/PR-2.2-develop
Browse files Browse the repository at this point in the history 
[Pangolin] Bump up MFTF and MTF version
  • Loading branch information
@okolesnyk
okolesnyk authored Feb 7, 2018
2 parents f18377b + b72e1b9 commit 5d9ca56
Show file tree
Hide file tree
Showing 337 changed files with 6,923 additions and 1,947 deletions.
11 changes: 11 additions & 0 deletions dev/tests/acceptance/.htaccess.sample
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
##############################################
## Allow access to command.php
<FilesMatch "command.php">
<IfVersion < 2.4>
order allow,deny
allow from all
</IfVersion>
<IfVersion >= 2.4>
Require all granted
</IfVersion>
</FilesMatch>
4 changes: 2 additions & 2 deletions dev/tests/acceptance/RoboFile.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

/** This is project's console commands configuration for Robo task runner.
*
* @codingStandardsIgnoreFile
* @codingStandardsIgnoreStart
* @see http://robo.li/
*/
class RoboFile extends \Robo\Tasks
Expand Down Expand Up @@ -46,7 +46,7 @@ function buildProject()
function generateTests($opts = ['config' => null])
{
require 'tests'. DIRECTORY_SEPARATOR . 'functional' . DIRECTORY_SEPARATOR . '_bootstrap.php';
\Magento\FunctionalTestingFramework\Util\TestGenerator::getInstance()->createAllCestFiles($opts['config']);
\Magento\FunctionalTestingFramework\Util\TestGenerator::getInstance()->createAllTestFiles($opts['config']);
$this->say("Generate Tests Command Run");
}

Expand Down
111 changes: 110 additions & 1 deletion dev/tests/acceptance/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,119 @@
"consolidation/robo": "^1.0.0",
"symfony/process": ">=2.7 <3.4",
"henrikbjorn/lurker": "^1.2",
"magento/magento2-functional-testing-framework": "1.0.0",
"magento/magento2-functional-testing-framework": "~2.0.0",
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
"vlucas/phpdotenv": "~2.4"
},
"replace": {
"magento/magento2-functional-test-module-marketplace": "100.0.0-dev",
"magento/magento2-functional-test-module-admin-notification": "100.0.0-dev",
"magento/magento2-functional-test-module-advanced-pricing-import-export": "100.0.0-dev",
"magento/magento2-functional-test-module-authorization": "100.0.0-dev",
"magento/magento2-functional-test-module-authorizenet": "100.0.0-dev",
"magento/magento2-functional-test-module-backend": "100.0.0-dev",
"magento/magento2-functional-test-module-backup": "100.0.0-dev",
"magento/magento2-functional-test-module-braintree": "100.0.0-dev",
"magento/magento2-functional-test-module-bundle": "100.0.0-dev",
"magento/magento2-functional-test-module-bundle-import-export": "100.0.0-dev",
"magento/magento2-functional-test-module-cache-invalidate": "100.0.0-dev",
"magento/magento2-functional-test-module-captcha": "100.0.0-dev",
"magento/magento2-functional-test-module-catalog": "100.0.0-dev",
"magento/magento2-functional-test-module-catalog-import-export": "100.0.0-dev",
"magento/magento2-functional-test-module-catalog-inventory": "100.0.0-dev",
"magento/magento2-functional-test-module-catalog-rule": "100.0.0-dev",
"magento/magento2-functional-test-module-catalog-rule-configurable": "100.0.0-dev",
"magento/magento2-functional-test-module-catalog-search": "100.0.0-dev",
"magento/magento2-functional-test-module-catalog-url-rewrite": "100.0.0-dev",
"magento/magento2-functional-test-module-catalog-widget": "100.0.0-dev",
"magento/magento2-functional-test-module-checkout": "100.0.0-dev",
"magento/magento2-functional-test-module-checkout-agreements": "100.0.0-dev",
"magento/magento2-functional-test-module-cms": "100.0.0-dev",
"magento/magento2-functional-test-module-cms-url-rewrite": "100.0.0-dev",
"magento/magento2-functional-test-module-config": "100.0.0-dev",
"magento/magento2-functional-test-module-configurable-import-export": "100.0.0-dev",
"magento/magento2-functional-test-module-configurable-product": "100.0.0-dev",
"magento/magento2-functional-test-module-configurable-product-sales": "100.0.0-dev",
"magento/magento2-functional-test-module-contact": "100.0.0-dev",
"magento/magento2-functional-test-module-cookie": "100.0.0-dev",
"magento/magento2-functional-test-module-cron": "100.0.0-dev",
"magento/magento2-functional-test-module-currency-symbol": "100.0.0-dev",
"magento/magento2-functional-test-module-customer": "100.0.0-dev",
"magento/magento2-functional-test-module-customer-import-export": "100.0.0-dev",
"magento/magento2-functional-test-module-deploy": "100.0.0-dev",
"magento/magento2-functional-test-module-developer": "100.0.0-dev",
"magento/magento2-functional-test-module-dhl": "100.0.0-dev",
"magento/magento2-functional-test-module-directory": "100.0.0-dev",
"magento/magento2-functional-test-module-downloadable": "100.0.0-dev",
"magento/magento2-functional-test-module-downloadable-import-export": "100.0.0-dev",
"magento/magento2-functional-test-module-eav": "100.0.0-dev",
"magento/magento2-functional-test-module-email": "100.0.0-dev",
"magento/magento2-functional-test-module-encryption-key": "100.0.0-dev",
"magento/magento2-functional-test-module-fedex": "100.0.0-dev",
"magento/magento2-functional-test-module-gift-message": "100.0.0-dev",
"magento/magento2-functional-test-module-google-adwords": "100.0.0-dev",
"magento/magento2-functional-test-module-google-analytics": "100.0.0-dev",
"magento/magento2-functional-test-module-google-optimizer": "100.0.0-dev",
"magento/magento2-functional-test-module-graph-ql": "100.0.0-dev",
"magento/magento2-functional-test-module-grouped-import-export": "100.0.0-dev",
"magento/magento2-functional-test-module-grouped-product": "100.0.0-dev",
"magento/magento2-functional-test-module-import-export": "100.0.0-dev",
"magento/magento2-functional-test-module-indexer": "100.0.0-dev",
"magento/magento2-functional-test-module-instant-purchase": "100.0.0-dev",
"magento/magento2-functional-test-module-integration": "100.0.0-dev",
"magento/magento2-functional-test-module-layered-navigation": "100.0.0-dev",
"magento/magento2-functional-test-module-media-storage": "100.0.0-dev",
"magento/magento2-functional-test-module-msrp": "100.0.0-dev",
"magento/magento2-functional-test-module-multishipping": "100.0.0-dev",
"magento/magento2-functional-test-module-new-relic-reporting": "100.0.0-dev",
"magento/magento2-functional-test-module-newsletter": "100.0.0-dev",
"magento/magento2-functional-test-module-offline-payments": "100.0.0-dev",
"magento/magento2-functional-test-module-offline-shipping": "100.0.0-dev",
"magento/magento2-functional-test-module-page-cache": "100.0.0-dev",
"magento/magento2-functional-test-module-payment": "100.0.0-dev",
"magento/magento2-functional-test-module-paypal": "100.0.0-dev",
"magento/magento2-functional-test-module-persistent": "100.0.0-dev",
"magento/magento2-functional-test-module-product-alert": "100.0.0-dev",
"magento/magento2-functional-test-module-product-video": "100.0.0-dev",
"magento/magento2-functional-test-module-quote": "100.0.0-dev",
"magento/magento2-functional-test-module-reports": "100.0.0-dev",
"magento/magento2-functional-test-module-require-js": "100.0.0-dev",
"magento/magento2-functional-test-module-review": "100.0.0-dev",
"magento/magento2-functional-test-module-robots": "100.0.0-dev",
"magento/magento2-functional-test-module-rss": "100.0.0-dev",
"magento/magento2-functional-test-module-rule": "100.0.0-dev",
"magento/magento2-functional-test-module-sales": "100.0.0-dev",
"magento/magento2-functional-test-module-sales-inventory": "100.0.0-dev",
"magento/magento2-functional-test-module-sales-rule": "100.0.0-dev",
"magento/magento2-functional-test-module-sales-sequence": "100.0.0-dev",
"magento/magento2-functional-test-module-sample-data": "100.0.0-dev",
"magento/magento2-functional-test-module-search": "100.0.0-dev",
"magento/magento2-functional-test-module-security": "100.0.0-dev",
"magento/magento2-functional-test-module-send-friend": "100.0.0-dev",
"magento/magento2-functional-test-module-shipping": "100.0.0-dev",
"magento/magento2-functional-test-module-sitemap": "100.0.0-dev",
"magento/magento2-functional-test-module-store": "100.0.0-dev",
"magento/magento2-functional-test-module-swagger": "100.0.0-dev",
"magento/magento2-functional-test-module-swatches": "100.0.0-dev",
"magento/magento2-functional-test-module-swatches-layered-navigation": "100.0.0-dev",
"magento/magento2-functional-test-module-tax": "100.0.0-dev",
"magento/magento2-functional-test-module-tax-import-export": "100.0.0-dev",
"magento/magento2-functional-test-module-theme": "100.0.0-dev",
"magento/magento2-functional-test-module-translation": "100.0.0-dev",
"magento/magento2-functional-test-module-ui": "100.0.0-dev",
"magento/magento2-functional-test-module-ups": "100.0.0-dev",
"magento/magento2-functional-test-module-url-rewrite": "100.0.0-dev",
"magento/magento2-functional-test-module-user": "100.0.0-dev",
"magento/magento2-functional-test-module-usps": "100.0.0-dev",
"magento/magento2-functional-test-module-variable": "100.0.0-dev",
"magento/magento2-functional-test-module-vault": "100.0.0-dev",
"magento/magento2-functional-test-module-version": "100.0.0-dev",
"magento/magento2-functional-test-module-webapi": "100.0.0-dev",
"magento/magento2-functional-test-module-webapi-security": "100.0.0-dev",
"magento/magento2-functional-test-module-weee": "100.0.0-dev",
"magento/magento2-functional-test-module-widget": "100.0.0-dev",
"magento/magento2-functional-test-module-wishlist": "100.0.0-dev"
},
"autoload": {
"psr-4": {
"Magento\\": "tests/functional/Magento"
Expand Down
Loading

0 comments on commit 5d9ca56

Please sign in to comment.