Skip to content

Commit ab96cb3

Browse files
Merge pull request #17079 to #17080
2 parents e8c3fec + 6a02ff6 commit ab96cb3

File tree

9 files changed

+11
-11
lines changed

9 files changed

+11
-11
lines changed

app/code/Magento/Catalog/view/adminhtml/web/js/product/weight-handler.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@ define([
6767
},
6868

6969
/**
70-
* Has weight swither
70+
* Has weight switcher
7171
* @returns {*}
7272
*/
73-
hasWeightSwither: function () {
73+
hasWeightSwitcher: function () {
7474
return this.$weightSwitcher().is(':visible');
7575
},
7676

@@ -107,7 +107,7 @@ define([
107107
'Magento_Catalog/js/product/weight-handler': function () {
108108
this.bindAll();
109109

110-
if (this.hasWeightSwither()) {
110+
if (this.hasWeightSwitcher()) {
111111
this.switchWeight();
112112
}
113113
},

app/code/Magento/Ui/view/base/web/js/lib/core/element/element.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ define([
4646
}
4747

4848
/**
49-
* Creates observable propery using 'track' method.
49+
* Creates observable property using 'track' method.
5050
*
5151
* @param {Object} obj - Object to whom property belongs.
5252
* @param {String} key - Key of the property.

dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetCmsPageLink.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
class AssertWidgetCmsPageLink extends AbstractConstraint
1919
{
2020
/**
21-
* Assert that created widget displayed on frontent on Home page and on Advanced Search and
21+
* Assert that created widget displayed on frontend on Home page and on Advanced Search and
2222
* after click on widget link on frontend system redirects you to cms page.
2323
*
2424
* @param CmsIndex $cmsIndex

dev/tests/integration/testsuite/Magento/Framework/App/Utility/_files/fixtures/theme/registration.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66

77
use \Magento\Framework\Component\ComponentRegistrar;
88

9-
ComponentRegistrar::register(ComponentRegistrar::THEME, 'frontent/Test/theme', __DIR__);
9+
ComponentRegistrar::register(ComponentRegistrar::THEME, 'frontend/Test/theme', __DIR__);
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
module Magento_Module *
2-
theme frontent/Test/theme One*
2+
theme frontend/Test/theme One*

dev/tests/static/framework/Magento/Sniffs/Less/PropertiesLineBreakSniff.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public function process(File $phpcsFile, $stackPtr)
4646
}
4747

4848
if ($tokens[$prevPtr]['line'] === $tokens[$stackPtr]['line']) {
49-
$error = 'Each propery must be on a line by itself';
49+
$error = 'Each property must be on a line by itself';
5050
$phpcsFile->addError($error, $stackPtr, 'SameLine');
5151
}
5252
}

lib/web/mage/utils/objects.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ define([
8383
* @private
8484
*
8585
* @param {Object} parent - Object from which to remove property.
86-
* @param {Array} path - Splitted path to the propery.
86+
* @param {Array} path - Splitted path to the property.
8787
*/
8888
function removeNested(parent, path) {
8989
var field = path.pop();

lib/web/mage/validation/url.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ define([], function () {
4242
/**
4343
* Sanitize url, replacing disallowed chars
4444
*
45-
* @param {Sring} path - url to be normalized
45+
* @param {String} path - url to be normalized
4646
* @returns {String}
4747
*/
4848
sanitize: function (path) {

setup/performance-toolkit/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ To get more details about available JMeter options, read [Non-GUI Mode](http://j
116116
For example, you can run the B2C scenario via console with 90 threads for the Frontend Pool and 10 threads for the Admin Pool:
117117

118118
cd {JMeter path}/bin/
119-
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
119+
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
120120

121121
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).
122122

0 commit comments

Comments
 (0)