diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminUserActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminUserActionGroup.xml index 30ca3f38fe736..23c322083773c 100644 --- a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminUserActionGroup.xml +++ b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminUserActionGroup.xml @@ -17,7 +17,7 @@ - + @@ -53,4 +53,4 @@ - \ No newline at end of file + diff --git a/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml b/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml index 4836c49d354b4..df2e98816f0d3 100644 --- a/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml +++ b/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml @@ -7,7 +7,7 @@ --> + xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd"> @@ -17,6 +17,9 @@ + + + @@ -42,7 +45,7 @@ - + diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml index 2452e7b36be00..1efff9783b90c 100644 --- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml +++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml @@ -7,7 +7,7 @@ --> + xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd"> @@ -88,6 +88,9 @@ <description value="Should be able to place an order as a customer with multiple addresses and tax rates."/> <testCaseId value="MAGETWO-93109"/> + <skip> + <issueId value="MQE-1187" /> + </skip> </annotations> <before> <createData entity="SimpleSubCategory" stepKey="simplecategory"/> diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml index b37c9e97a78fc..46aa4ac22e03c 100644 --- a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml +++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml @@ -16,6 +16,9 @@ <description value="Admin should be able to add image to WYSIWYG content of Block"/> <severity value="CRITICAL"/> <testCaseId value="MAGETWO-84376"/> + <skip> + <issueId value="MQE-1187" /> + </skip> </annotations> <before> <createData entity="_defaultCmsPage" stepKey="createCMSPage" /> diff --git a/composer.json b/composer.json index 2eba717464e68..3f0c765bfaef5 100644 --- a/composer.json +++ b/composer.json @@ -81,7 +81,7 @@ "zendframework/zend-view": "~2.10.0" }, "require-dev": { - "magento/magento2-functional-testing-framework": "2.3.3", + "magento/magento2-functional-testing-framework": "2.3.4", "friendsofphp/php-cs-fixer": "~2.12.0", "lusitanian/oauth": "~0.8.10", "pdepend/pdepend": "2.5.2", diff --git a/composer.lock b/composer.lock index 430b233d72fc6..39c9e37ce833d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "57ae7ad75c4d8d50eb40e4ffe0fd2740", + "content-hash": "2dd0a131df2b0f816b7dea047b3c136e", "packages": [ { "name": "braintree/braintree_php", @@ -201,16 +201,16 @@ }, { "name": "composer/ca-bundle", - "version": "1.1.1", + "version": "1.1.2", "source": { "type": "git", "url": "https://github.com/composer/ca-bundle.git", - "reference": "d2c0a83b7533d6912e8d516756ebd34f893e9169" + "reference": "46afded9720f40b9dc63542af4e3e43a1177acb0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/d2c0a83b7533d6912e8d516756ebd34f893e9169", - "reference": "d2c0a83b7533d6912e8d516756ebd34f893e9169", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/46afded9720f40b9dc63542af4e3e43a1177acb0", + "reference": "46afded9720f40b9dc63542af4e3e43a1177acb0", "shasum": "" }, "require": { @@ -253,20 +253,20 @@ "ssl", "tls" ], - "time": "2018-03-29T19:57:20+00:00" + "time": "2018-08-08T08:57:40+00:00" }, { "name": "composer/composer", - "version": "1.7.0", + "version": "1.7.1", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "39edb2f375679a4eba19e69e9c9491e302976983" + "reference": "5d9311d4555787c8a57fea15f82471499aedf712" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/39edb2f375679a4eba19e69e9c9491e302976983", - "reference": "39edb2f375679a4eba19e69e9c9491e302976983", + "url": "https://api.github.com/repos/composer/composer/zipball/5d9311d4555787c8a57fea15f82471499aedf712", + "reference": "5d9311d4555787c8a57fea15f82471499aedf712", "shasum": "" }, "require": { @@ -333,7 +333,7 @@ "dependency", "package" ], - "time": "2018-08-03T13:39:07+00:00" + "time": "2018-08-07T07:39:23+00:00" }, { "name": "composer/semver", @@ -872,16 +872,16 @@ }, { "name": "magento/zendframework1", - "version": "1.14.0", + "version": "1.14.1", "source": { "type": "git", "url": "https://github.com/magento/zf1.git", - "reference": "68522e5768edc8e829d1f64b620a3de3753f1141" + "reference": "4df018254c70b5b998b00a8cb1a30760f831ff0d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/magento/zf1/zipball/68522e5768edc8e829d1f64b620a3de3753f1141", - "reference": "68522e5768edc8e829d1f64b620a3de3753f1141", + "url": "https://api.github.com/repos/magento/zf1/zipball/4df018254c70b5b998b00a8cb1a30760f831ff0d", + "reference": "4df018254c70b5b998b00a8cb1a30760f831ff0d", "shasum": "" }, "require": { @@ -915,7 +915,7 @@ "ZF1", "framework" ], - "time": "2018-04-06T18:49:03+00:00" + "time": "2018-08-09T15:03:40+00:00" }, { "name": "monolog/monolog", @@ -2717,16 +2717,16 @@ }, { "name": "zendframework/zend-diactoros", - "version": "1.8.4", + "version": "1.8.5", "source": { "type": "git", "url": "https://github.com/zendframework/zend-diactoros.git", - "reference": "736ffa7c2bfa4a60e8a10acb316fa2ac456c5fba" + "reference": "3e4edb822c942f37ade0d09579cfbab11e2fee87" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/736ffa7c2bfa4a60e8a10acb316fa2ac456c5fba", - "reference": "736ffa7c2bfa4a60e8a10acb316fa2ac456c5fba", + "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/3e4edb822c942f37ade0d09579cfbab11e2fee87", + "reference": "3e4edb822c942f37ade0d09579cfbab11e2fee87", "shasum": "" }, "require": { @@ -2776,7 +2776,7 @@ "psr", "psr-7" ], - "time": "2018-08-01T13:47:49+00:00" + "time": "2018-08-10T14:16:32+00:00" }, { "name": "zendframework/zend-escaper", @@ -4777,16 +4777,16 @@ }, { "name": "consolidation/config", - "version": "1.0.11", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/consolidation/config.git", - "reference": "ede41d946078e97e7a9513aadc3352f1c26817af" + "reference": "c9fc25e9088a708637e18a256321addc0670e578" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/config/zipball/ede41d946078e97e7a9513aadc3352f1c26817af", - "reference": "ede41d946078e97e7a9513aadc3352f1c26817af", + "url": "https://api.github.com/repos/consolidation/config/zipball/c9fc25e9088a708637e18a256321addc0670e578", + "reference": "c9fc25e9088a708637e18a256321addc0670e578", "shasum": "" }, "require": { @@ -4796,7 +4796,7 @@ }, "require-dev": { "g1a/composer-test-scenarios": "^1", - "phpunit/phpunit": "^4", + "phpunit/phpunit": "^5", "satooshi/php-coveralls": "^1.0", "squizlabs/php_codesniffer": "2.*", "symfony/console": "^2.5|^3|^4", @@ -4827,7 +4827,7 @@ } ], "description": "Provide configuration services for a commandline tool.", - "time": "2018-05-27T01:17:02+00:00" + "time": "2018-08-07T22:57:00+00:00" }, { "name": "consolidation/log", @@ -6183,16 +6183,16 @@ }, { "name": "magento/magento2-functional-testing-framework", - "version": "2.3.3", + "version": "2.3.4", "source": { "type": "git", "url": "https://github.com/magento/magento2-functional-testing-framework.git", - "reference": "885c5a0562cd2e428ba6bdafaff86fce78ad6b08" + "reference": "ac56e5a6520dd580658034ae53d3724985c2a901" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/885c5a0562cd2e428ba6bdafaff86fce78ad6b08", - "reference": "885c5a0562cd2e428ba6bdafaff86fce78ad6b08", + "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/ac56e5a6520dd580658034ae53d3724985c2a901", + "reference": "ac56e5a6520dd580658034ae53d3724985c2a901", "shasum": "" }, "require": { @@ -6250,7 +6250,7 @@ "magento", "testing" ], - "time": "2018-08-06T18:35:58+00:00" + "time": "2018-08-10T20:16:42+00:00" }, { "name": "moontoast/math", @@ -7218,16 +7218,16 @@ }, { "name": "phpunit/phpunit", - "version": "6.5.10", + "version": "6.5.11", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "5744955af9c0a2de74a5eb5287c50bf025100d39" + "reference": "7bab54cb366076023bbf457a2a0d513332cd40f2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/5744955af9c0a2de74a5eb5287c50bf025100d39", - "reference": "5744955af9c0a2de74a5eb5287c50bf025100d39", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/7bab54cb366076023bbf457a2a0d513332cd40f2", + "reference": "7bab54cb366076023bbf457a2a0d513332cd40f2", "shasum": "" }, "require": { @@ -7245,7 +7245,7 @@ "phpunit/php-file-iterator": "^1.4.3", "phpunit/php-text-template": "^1.2.1", "phpunit/php-timer": "^1.0.9", - "phpunit/phpunit-mock-objects": "^5.0.8", + "phpunit/phpunit-mock-objects": "^5.0.9", "sebastian/comparator": "^2.1", "sebastian/diff": "^2.0", "sebastian/environment": "^3.1", @@ -7298,20 +7298,20 @@ "testing", "xunit" ], - "time": "2018-08-03T05:27:14+00:00" + "time": "2018-08-07T07:05:35+00:00" }, { "name": "phpunit/phpunit-mock-objects", - "version": "5.0.8", + "version": "5.0.10", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", - "reference": "6f9a3c8bf34188a2b53ce2ae7a126089c53e0a9f" + "reference": "cd1cf05c553ecfec36b170070573e540b67d3f1f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/6f9a3c8bf34188a2b53ce2ae7a126089c53e0a9f", - "reference": "6f9a3c8bf34188a2b53ce2ae7a126089c53e0a9f", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/cd1cf05c553ecfec36b170070573e540b67d3f1f", + "reference": "cd1cf05c553ecfec36b170070573e540b67d3f1f", "shasum": "" }, "require": { @@ -7324,7 +7324,7 @@ "phpunit/phpunit": "<6.0" }, "require-dev": { - "phpunit/phpunit": "^6.5" + "phpunit/phpunit": "^6.5.11" }, "suggest": { "ext-soap": "*" @@ -7357,7 +7357,7 @@ "mock", "xunit" ], - "time": "2018-07-13T03:27:23+00:00" + "time": "2018-08-09T05:50:03+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", diff --git a/dev/tests/acceptance/RoboFile.php b/dev/tests/acceptance/RoboFile.php index f36150ad254b5..e6e9e591bbd8b 100644 --- a/dev/tests/acceptance/RoboFile.php +++ b/dev/tests/acceptance/RoboFile.php @@ -31,7 +31,7 @@ function buildProject() * * @param array $tests * @param array $opts - * @return void + * @return \Robo\Result */ function generateTests(array $tests, $opts = [ 'config' => null, @@ -56,7 +56,7 @@ function generateTests(array $tests, $opts = [ $baseCmd .= ' --force'; } - $this->taskExec($baseCmd)->args($tests)->run(); + return $this->taskExec($baseCmd)->args($tests)->run(); } /** @@ -64,7 +64,7 @@ function generateTests(array $tests, $opts = [ * * @param array $args * @throws Exception - * @return void + * @return \Robo\Result */ function generateSuite(array $args) { @@ -72,20 +72,20 @@ function generateSuite(array $args) throw new Exception("Please provide suite name(s) after generate:suite command"); } $baseCmd = $this->getBaseCmd("generate:suite"); - $this->taskExec($baseCmd)->args($args)->run(); + return $this->taskExec($baseCmd)->args($args)->run(); } /** * Run all Tests with the specified @group tag'. * * @param array $args - * @return void + * @return \Robo\Result */ function group(array $args) { $args = array_merge($args, ['-k']); $baseCmd = $this->getBaseCmd("run:group"); - $this->taskExec($baseCmd)->args($args)->run(); + return $this->taskExec($baseCmd)->args($args)->run(); } /** @@ -111,48 +111,52 @@ function allure2Generate() /** * Open the HTML Allure report - Allure v1.4.X * - * @return void + * @return \Robo\Result */ function allure1Open() { - $this->_exec('allure report open --report-dir tests'. DIRECTORY_SEPARATOR .'_output'. DIRECTORY_SEPARATOR .'allure-report'. DIRECTORY_SEPARATOR .''); + return $this->_exec('allure report open --report-dir tests'. DIRECTORY_SEPARATOR .'_output'. DIRECTORY_SEPARATOR .'allure-report'. DIRECTORY_SEPARATOR .''); } /** * Open the HTML Allure report - Allure v2.3.X * - * @return void + * @return \Robo\Result */ function allure2Open() { - $this->_exec('allure open --port 0 tests'. DIRECTORY_SEPARATOR .'_output'. DIRECTORY_SEPARATOR .'allure-report'. DIRECTORY_SEPARATOR .''); + return $this->_exec('allure open --port 0 tests'. DIRECTORY_SEPARATOR .'_output'. DIRECTORY_SEPARATOR .'allure-report'. DIRECTORY_SEPARATOR .''); } /** * Generate and open the HTML Allure report - Allure v1.4.X * - * @return void + * @return \Robo\Result */ function allure1Report() { $result1 = $this->allure1Generate(); if ($result1->wasSuccessful()) { - $this->allure1Open(); + return $this->allure1Open(); + } else { + return $result1; } } /** * Generate and open the HTML Allure report - Allure v2.3.X * - * @return void + * @return \Robo\Result */ function allure2Report() { $result1 = $this->allure2Generate(); if ($result1->wasSuccessful()) { - $this->allure2Open(); + return $this->allure2Open(); + } else { + return $result1; } } @@ -168,4 +172,4 @@ private function getBaseCmd($command) chdir(__DIR__); return realpath('../../../vendor/bin/mftf') . " $command"; } -} +} \ No newline at end of file diff --git a/lib/web/mage/collapsible.js b/lib/web/mage/collapsible.js index 97ee3af506f86..245c4a38a6aa9 100644 --- a/lib/web/mage/collapsible.js +++ b/lib/web/mage/collapsible.js @@ -448,6 +448,7 @@ define([ if (this.options.animate) { this._animate(showProps); } else { + this._scrollToTopIfVisible(this.content.get(0).parentElement); this.content.show(); } this._open(); @@ -553,6 +554,27 @@ define([ }, 1); }); } + }, + + /** + * @param {HTMLElement} elem + * @private + */ + _scrollToTopIfVisible: function (elem) { + if (this._isElementOutOfViewport(elem)) { + elem.scrollIntoView(); + } + }, + + /** + * @param {HTMLElement} elem + * @private + * @return {Boolean} + */ + _isElementOutOfViewport: function (elem) { + var rect = elem.getBoundingClientRect(); + + return rect.bottom < 0 || rect.right < 0 || rect.left > window.innerWidth || rect.top > window.innerHeight; } });