From 7a06617efe73de505057d23300eb7cad8ef26975 Mon Sep 17 00:00:00 2001 From: mage2pratik Date: Sat, 21 Jul 2018 00:32:19 +0530 Subject: [PATCH 1/2] Declare module namespace before template path name --- .../Adminhtml/Product/Attribute/Set/Main/Tree/Attribute.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Attribute.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Attribute.php index f5e3f94418687..cb0a739b56e4e 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Attribute.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Attribute.php @@ -14,5 +14,5 @@ class Attribute extends \Magento\Backend\Block\Template /** * @var string */ - protected $_template = 'catalog/product/attribute/set/main/tree/attribute.phtml'; + protected $_template = 'Magento_Catalog::catalog/product/attribute/set/main/tree/attribute.phtml'; } From 920daf51df19201537dec19fee47e7b083c8c886 Mon Sep 17 00:00:00 2001 From: mage2pratik Date: Sat, 21 Jul 2018 02:02:33 +0530 Subject: [PATCH 2/2] Fixed a couple of spelling mistakes --- .../Catalog/view/adminhtml/web/js/product/weight-handler.js | 2 +- .../Signifyd/Test/Unit/Controller/Webhooks/HandlerTest.php | 2 +- .../Magento/Ui/view/base/web/js/lib/core/element/element.js | 2 +- .../Widget/Test/Constraint/AssertWidgetCmsPageLink.php | 2 +- .../App/Utility/_files/fixtures/theme/registration.php | 2 +- .../Framework/App/Utility/_files/patterns/paths_one.txt | 2 +- .../Magento/Sniffs/Less/PropertiesLineBreakSniff.php | 2 +- .../Framework/DB/Test/Unit/Adapter/Pdo/MysqlTest.php | 6 +++--- lib/web/mage/utils/objects.js | 2 +- lib/web/mage/validation/url.js | 2 +- setup/performance-toolkit/README.md | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/product/weight-handler.js b/app/code/Magento/Catalog/view/adminhtml/web/js/product/weight-handler.js index 475c9d2dc0601..1c79331253251 100644 --- a/app/code/Magento/Catalog/view/adminhtml/web/js/product/weight-handler.js +++ b/app/code/Magento/Catalog/view/adminhtml/web/js/product/weight-handler.js @@ -67,7 +67,7 @@ define([ }, /** - * Has weight swither + * Has weight switcher * @returns {*} */ hasWeightSwither: function () { diff --git a/app/code/Magento/Signifyd/Test/Unit/Controller/Webhooks/HandlerTest.php b/app/code/Magento/Signifyd/Test/Unit/Controller/Webhooks/HandlerTest.php index 1a8cfdc703247..8b98be338b973 100644 --- a/app/code/Magento/Signifyd/Test/Unit/Controller/Webhooks/HandlerTest.php +++ b/app/code/Magento/Signifyd/Test/Unit/Controller/Webhooks/HandlerTest.php @@ -140,7 +140,7 @@ protected function setUp() } /** - * Successfull case + * Successful case */ public function testExecuteSuccessfully() { diff --git a/app/code/Magento/Ui/view/base/web/js/lib/core/element/element.js b/app/code/Magento/Ui/view/base/web/js/lib/core/element/element.js index b228494b422c3..1684f0b220175 100644 --- a/app/code/Magento/Ui/view/base/web/js/lib/core/element/element.js +++ b/app/code/Magento/Ui/view/base/web/js/lib/core/element/element.js @@ -46,7 +46,7 @@ define([ } /** - * Creates observable propery using 'track' method. + * Creates observable property using 'track' method. * * @param {Object} obj - Object to whom property belongs. * @param {String} key - Key of the property. diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetCmsPageLink.php b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetCmsPageLink.php index 636af4e8032db..40de8e67ce2a7 100644 --- a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetCmsPageLink.php +++ b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetCmsPageLink.php @@ -18,7 +18,7 @@ class AssertWidgetCmsPageLink extends AbstractConstraint { /** - * Assert that created widget displayed on frontent on Home page and on Advanced Search and + * Assert that created widget displayed on frontend on Home page and on Advanced Search and * after click on widget link on frontend system redirects you to cms page. * * @param CmsIndex $cmsIndex diff --git a/dev/tests/integration/testsuite/Magento/Framework/App/Utility/_files/fixtures/theme/registration.php b/dev/tests/integration/testsuite/Magento/Framework/App/Utility/_files/fixtures/theme/registration.php index 5e5515b4b95fe..68f74c880460c 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/App/Utility/_files/fixtures/theme/registration.php +++ b/dev/tests/integration/testsuite/Magento/Framework/App/Utility/_files/fixtures/theme/registration.php @@ -6,6 +6,6 @@ \Magento\Framework\Component\ComponentRegistrar::register( \Magento\Framework\Component\ComponentRegistrar::THEME, - 'frontent/Test/theme', + 'frontend/Test/theme', __DIR__ ); diff --git a/dev/tests/integration/testsuite/Magento/Framework/App/Utility/_files/patterns/paths_one.txt b/dev/tests/integration/testsuite/Magento/Framework/App/Utility/_files/patterns/paths_one.txt index 8f2df480aabc5..f9cd49de77d67 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/App/Utility/_files/patterns/paths_one.txt +++ b/dev/tests/integration/testsuite/Magento/Framework/App/Utility/_files/patterns/paths_one.txt @@ -1,2 +1,2 @@ module Magento_Module * -theme frontent/Test/theme One* +theme frontend/Test/theme One* diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesLineBreakSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesLineBreakSniff.php index a1fe346aae3b6..3f33d0b2c69d5 100644 --- a/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesLineBreakSniff.php +++ b/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesLineBreakSniff.php @@ -46,7 +46,7 @@ public function process(File $phpcsFile, $stackPtr) } if ($tokens[$prevPtr]['line'] === $tokens[$stackPtr]['line']) { - $error = 'Each propery must be on a line by itself'; + $error = 'Each property must be on a line by itself'; $phpcsFile->addError($error, $stackPtr, 'SameLine'); } } diff --git a/lib/internal/Magento/Framework/DB/Test/Unit/Adapter/Pdo/MysqlTest.php b/lib/internal/Magento/Framework/DB/Test/Unit/Adapter/Pdo/MysqlTest.php index a95c8fc21f99e..440b4ef274ec7 100644 --- a/lib/internal/Magento/Framework/DB/Test/Unit/Adapter/Pdo/MysqlTest.php +++ b/lib/internal/Magento/Framework/DB/Test/Unit/Adapter/Pdo/MysqlTest.php @@ -290,7 +290,7 @@ public function testAsymmetricRollBackSuccess() } /** - * Test successfull nested transaction + * Test successful nested transaction */ public function testNestedTransactionCommitSuccess() { @@ -312,7 +312,7 @@ public function testNestedTransactionCommitSuccess() } /** - * Test successfull nested transaction + * Test successful nested transaction */ public function testNestedTransactionRollBackSuccess() { @@ -334,7 +334,7 @@ public function testNestedTransactionRollBackSuccess() } /** - * Test successfull nested transaction + * Test successful nested transaction */ public function testNestedTransactionLastRollBack() { diff --git a/lib/web/mage/utils/objects.js b/lib/web/mage/utils/objects.js index d0b77aa4320e3..bd0e496339ace 100644 --- a/lib/web/mage/utils/objects.js +++ b/lib/web/mage/utils/objects.js @@ -83,7 +83,7 @@ define([ * @private * * @param {Object} parent - Object from which to remove property. - * @param {Array} path - Splitted path to the propery. + * @param {Array} path - Splitted path to the property. */ function removeNested(parent, path) { var field = path.pop(); diff --git a/lib/web/mage/validation/url.js b/lib/web/mage/validation/url.js index 67e0e989d248e..00ac3fd4eb15d 100644 --- a/lib/web/mage/validation/url.js +++ b/lib/web/mage/validation/url.js @@ -42,7 +42,7 @@ define([], function () { /** * Sanitize url, replacing disallowed chars * - * @param {Sring} path - url to be normalized + * @param {String} path - url to be normalized * @returns {String} */ sanitize: function (path) { diff --git a/setup/performance-toolkit/README.md b/setup/performance-toolkit/README.md index 700f6cd0d775d..bb0a023ab8af1 100644 --- a/setup/performance-toolkit/README.md +++ b/setup/performance-toolkit/README.md @@ -116,7 +116,7 @@ To get more details about available JMeter options, read [Non-GUI Mode](http://j For example, you can run the B2C scenario via console with 90 threads for the Frontend Pool and 10 threads for the Admin Pool: cd {JMeter path}/bin/ - jmeter -n -t {path to peformance toolkit}/benchmark.jmx -j ./jmeter.log -l ./jmeter-results.jtl -Jhost=magento2.dev -Jbase_path=/ -Jadmin_path=admin -JfrontendPoolUsers=90 -JadminPoolUsers=10 + jmeter -n -t {path to performance toolkit}/benchmark.jmx -j ./jmeter.log -l ./jmeter-results.jtl -Jhost=magento2.dev -Jbase_path=/ -Jadmin_path=admin -JfrontendPoolUsers=90 -JadminPoolUsers=10 As a result, you will get `jmeter.log` and `jmeter-results.jtl`. The`jmeter.log` contains information about the test run and can be helpful in determining the cause of an error. The JTL file is a text file containing the results of a test run. It can be opened in the GUI mode to perform analysis of the results (see the *Output* section below).