Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ public function getMainTable(int $storeId)
public function createTablesForStore(int $storeId)
{
$mainTableName = $this->getMainTable($storeId);
//Create index table for store based on on main replica table
//Create index table for store based on main replica table
//Using main replica table is necessary for backward capability and TableResolver plugin work
$this->createTable(
$this->getTable(AbstractAction::MAIN_INDEX_TABLE . $this->additionalTableSuffix),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ protected function _createItem($label, $value, $count = 0)
}

/**
* Get all product ids from from collection with applied filters
* Get all product ids from collection with applied filters
*
* @return array
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ protected function _saveValueTitles(\Magento\Framework\Model\AbstractModel $obje
}

/**
* Get first col from from first row for option table
* Get first col from first row for option table
*
* @param string $tableName
* @param int $optionId
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ protected function _saveValueTitles(AbstractModel $object)
}

/**
* Get first col from from first row for option table
* Get first col from first row for option table
*
* @param string $tableName
* @param int $optionId
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,10 @@ define([
},

/**
* Has weight swither
* Has weight switcher
* @returns {*}
*/
hasWeightSwither: function () {
hasWeightSwitcher: function () {
return this.$weightSwitcher().is(':visible');
},

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

if (this.hasWeightSwither()) {
if (this.hasWeightSwitcher()) {
this.switchWeight();
}
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<waitForPageLoad stepKey="waitForPriceRulePage"/>
<click stepKey="addNewRule" selector="{{AdminGridMainControls.add}}"/>

<!-- Fill the form according the the attributes of the entity -->
<!-- Fill the form according the attributes of the entity -->
<fillField stepKey="fillName" selector="{{AdminNewCatalogPriceRule.ruleName}}" userInput="{{catalogRule.name}}"/>
<fillField stepKey="fillDescription" selector="{{AdminNewCatalogPriceRule.description}}" userInput="{{catalogRule.description}}"/>
<selectOption stepKey="selectSite" selector="{{AdminNewCatalogPriceRule.websites}}" userInput="{{catalogRule.website_ids[0]}}"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public function execute()

/**
* Return component referer url
* TODO: Technical dept referer url should be implement as a part of Action configuration in in appropriate way
* TODO: Technical dept referer url should be implement as a part of Action configuration in appropriate way
*
* @return null|string
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public function addProductToFilter($product)
}

/**
* Retrieve title for for current store
* Retrieve title for current store
*
* @param int $storeId
* @return $this
Expand All @@ -113,7 +113,7 @@ public function addTitleToResult($storeId = 0)
}

/**
* Retrieve price for for current website
* Retrieve price for current website
*
* @param int $websiteId
* @return $this
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/ReleaseNotification/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ Each modal page can have the following optional content:

The Sub Heading section is ideally used on the first modal page as a way to describe one to three highlighted features that will be presented in greater detail on the following modal pages. It is recommended to use the Main Content -> Text Body and Bullet Point lists as the paragraph and list content displayed on a highlighted feature's detail modal page.

A clickable link to internal or external content in any text field will be created by using the following format and opened in a new browser tab. Providing the URL for the link followed by the the text to be displayed for that link in brackets will cause a clickable link to be created. The text between the brackets [text] will be the text that the clickable link shows.
A clickable link to internal or external content in any text field will be created by using the following format and opened in a new browser tab. Providing the URL for the link followed by the text to be displayed for that link in brackets will cause a clickable link to be created. The text between the brackets [text] will be the text that the clickable link shows.

### Link Format Example:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public function execute()

/**
* Return component referrer url
* TODO: Technical dept referrer url should be implement as a part of Action configuration in in appropriate way
* TODO: Technical dept referrer url should be implement as a part of Action configuration in appropriate way
*
* @return null|string
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public function call($serviceInfo, $arguments = [], $storeCode = null, $integrat
}

/**
* Get proper SOAP client instance that is initialized with with WSDL corresponding to requested service interface.
* Get proper SOAP client instance that is initialized with WSDL corresponding to requested service interface.
*
* @param string $serviceInfo PHP service interface name, should include version if present
* @param string|null $storeCode
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
class Links extends Block
{
/**
* Selector title for for links
* Selector title for links
*
* @var string
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class AssertVersionOnGrid extends AbstractConstraint
/*#@-*/

/**
* Assert that that version of extension is correct.
* Assert that version of extension is correct.
*
* @param Grid $grid
* @param Extension $extension
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
use Magento\Mtf\Constraint\AbstractConstraint;

/**
* Check that that widget with type Recently Viewed Products is present on category page
* Check that widget with type Recently Viewed Products is present on category page
*/
class AssertWidgetRecentlyViewedProducts extends AbstractConstraint
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@

use \Magento\Framework\Component\ComponentRegistrar;

ComponentRegistrar::register(ComponentRegistrar::THEME, 'frontent/Test/theme', __DIR__);
ComponentRegistrar::register(ComponentRegistrar::THEME, 'frontend/Test/theme', __DIR__);
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
module Magento_Module *
theme frontent/Test/theme One*
theme frontend/Test/theme One*
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ enumValues(includeDeprecated: true) {
'Missing type in the response'
);
}
//Checks to make sure that the the given description exists in the expectedOutput array
//Checks to make sure that the given description exists in the expectedOutput array
$this->assertTrue(
array_key_exists(
array_search(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public function execute(array $messages, InputInterface $input, OutputInterface
}

/**
* Creates Question object from from given array of messages.
* Creates Question object from given array of messages.
*
* @param string[] $messages array of messages
* @return Question
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

/**
* Class TemporaryTableService creates a temporary table in mysql from a Magento\Framework\DB\Select.
* Use this class to create an index with that that you want to query later for quick data access
* Use this class to create an index with that you want to query later for quick data access
*
* @api
* @since 100.2.0
Expand Down
2 changes: 1 addition & 1 deletion lib/web/mage/utils/objects.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion lib/web/mage/validation/url.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion lib/web/prototype/windows/README
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ See samples/index.html for more details and go on my web page : http://prototype
- Add Windows.focusedWindow and Windows.closeAll
- Add name to iframe in case of url window
- Clean up code, use _ for private function (just name convention)
- Add Dialog.info function, usefull for for submit or notice info (in Rails)
- Add Dialog.info function, usefull for submit or notice info (in Rails)
- Add minimize and maximize buttons
- Add alert_lite.css without any images
- Debug
Expand Down
2 changes: 1 addition & 1 deletion setup/performance-toolkit/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).

Expand Down