Skip to content
This repository was archived by the owner on Nov 19, 2024. It is now read-only.

Commit ffce775

Browse files
author
Dmitry Shevtsov
committed
added minor edits
1 parent 6523017 commit ffce775

9 files changed

+11
-21
lines changed

guides/v2.0/mtf/mtf_entities/mtf_block.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ github_link: mtf/mtf_entities/mtf_block.md
1010

1111
<h2>Block</h2>
1212

13-
<h3>Contents</h3>
14-
1513
* TOC
1614
{:toc}
1715

@@ -205,7 +203,7 @@ Let's see the [Customer Login]({{site.mage2000url}}app/code/Magento/Customer/Blo
205203

206204
<a href="{{site.baseurl}}common/images/mtf_block_login_ui.png"><img src="{{site.baseurl}}common/images/mtf_block_login_ui.png" /></a>
207205

208-
The mapping file for the block is stored in `magento2/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/Login.xml`, along with the block.
206+
The mapping file for the block is stored in `<magento2>/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/Login.xml`, along with the block.
209207

210208
<img src="{{site.baseurl}}common/images/mtf_block_login_dir.png" />
211209

guides/v2.0/mtf/mtf_entities/mtf_fixture-repo.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ github_link: mtf/mtf_entities/mtf_fixture-repo.md
1010

1111
<h2>Fixture repository</h2>
1212

13-
<h3>Contents</h3>
14-
1513
* TOC
1614
{:toc}
1715

@@ -441,7 +439,7 @@ The preceding is an example of repository merging. Using the approach from the e
441439

442440
Credentials are stored in XML file specified in `phpunit.xml`.
443441

444-
You can find a template for credentials in <a href="https://github.com/magento/magento2/blob/master/dev/tests/functional/credentials.xml.dist"><code>magento2/dev/tests/functional/credentials.xml.dist</code></a>.
442+
You can find a template for credentials in <a href="https://github.com/magento/magento2/blob/master/dev/tests/functional/credentials.xml.dist"><code>&lt;magento2&gt;/dev/tests/functional/credentials.xml.dist</code></a>.
445443

446444
Credentials always should stay invisible for security reasons. The MTF implicitly pastes credentials during the test run only.
447445
There are two ways to paste credentials:

guides/v2.0/mtf/mtf_entities/mtf_fixture.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@ menu_order: 1
88
github_link: mtf/mtf_entities/mtf_fixture.md
99
---
1010

11-
<h2>Fixture</h3>
12-
13-
<h3 id="mtf_fixture_content">Contents</h3>
11+
<h2>Fixture</h2>
1412

1513
* TOC
1614
{:toc}

guides/v2.0/mtf/mtf_entities/mtf_handler.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ github_link: mtf/mtf_entities/mtf_handler.md
1010

1111
<h2>Handler</h2>
1212

13-
<h3 id="mtf_handler_overview">Contents</h3>
14-
1513
* TOC
1614
{:toc}
1715

@@ -41,7 +39,7 @@ One fixture can have various handlers. When we create an entity in the test we d
4139

4240
### `config.xml` {#mtf_handler_configxml}
4341

44-
The default configuration for handlers is set in <a href="{{site.mage2000url}}dev/tests/functional/etc/config.xml.dist"><code>magento2/dev/tests/functional/etc/config.xml.dist</code></a>. Create a duplicate of the file, and keep both, but make changes to the new one, which is called `config.xml`:
42+
The default configuration for handlers is set in <a href="{{site.mage2000url}}dev/tests/functional/etc/config.xml.dist"><code>&lt;magento2&gt;/dev/tests/functional/etc/config.xml.dist</code></a>. Create a duplicate of the file, and keep both, but make changes to the new one, which is called `config.xml`:
4543

4644
cp config.xml.dist config.xml
4745

guides/v2.0/mtf/mtf_entities/mtf_page.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ github_link: mtf/mtf_entities/mtf_page.md
1010

1111
<h2>Page</h2>
1212

13-
<h3>Contents</h3>
14-
1513
* TOC
1614
{:toc}
1715

@@ -101,7 +99,7 @@ The page will be opened as a concatenation of `app_backend_url` from `<magento2>
10199

102100
Storefront page is recognizable by `area` assigned any value except `Adminhtml`, *and* `mca` doesn't have `http`. This type of page extends the [Mtf\Page\FrontendPage][] class.
103101

104-
The page will be opened as concatenation of `app_frontend_url` from `magento2/dev/tests/functional/phpunit.xml` and [mca](#mca) link.
102+
The page will be opened as concatenation of `app_frontend_url` from `<magento2>/dev/tests/functional/phpunit.xml` and [mca](#mca) link.
105103

106104
### External page {#mtf_page_extern}
107105

guides/v2.0/mtf/mtf_installation.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ menu_order: 2
99
github_link: mtf/mtf_installation.md
1010
---
1111
<h2>Preface</h2>
12-
Well, you are on the way to install the Magento testing Framework!
12+
Well, you are on the way to install the Magento Testing Framework!
1313

1414
Follow the next three steps:
1515

@@ -65,7 +65,7 @@ The Magento Testing Framework requires Composer, which downloads libraries defin
6565
<div class="bs-callout bs-callout-info" id="info">
6666
<p>If command failed, maybe <a href="https://getcomposer.org">Composer</a> hasn't been installed globally.<br/>
6767
Copy <code>composer.phar</code> to <code>/usr/local/bin/composer</code>.<br/>
68-
To run it locally put <code>composer.phar</code> into directory, where <code>composer.json</code> file is located (that is, <code>magento2/dev/tests/functional/</code>).<br/>
68+
To run it locally put <code>composer.phar</code> into directory, where <code>composer.json</code> file is located (that is, <code>&lt;magento2&gt;/dev/tests/functional/</code>).<br/>
6969
And run from this directory <code>php composer.phar install</code>.</p>
7070
</div>
7171

guides/v2.0/mtf/mtf_quickstart/mtf_quickstart_config.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ For `name="credentials_file_path" ` set `value="<full_path_to_directory>"` (that
4444
### Edit `config.xml` to configure Magento Testing Framework {#mtf_quickstart_config_configxml}
4545

4646
<div class="bs-callout bs-callout-info" id="info">
47-
<p>The default configuration is set in <a href="{{site.mage2000url}}dev/tests/functional/etc/config.xml.dist"><code>magento2/dev/tests/functional/etc/config.xml.dist</code></a>. It should be copied as <code>config.xml</code> for further changes.</p>
47+
<p>The default configuration is set in <a href="{{site.mage2000url}}dev/tests/functional/etc/config.xml.dist"><code>&lt;magento2&gt;/dev/tests/functional/etc/config.xml.dist</code></a>. It should be copied as <code>config.xml</code> for further changes.</p>
4848
</div>
4949

5050
Find `config.xml` in `<magento2>/dev/tests/functional/etc`, and open it in editor.

guides/v2.0/mtf/mtf_quickstart/mtf_quickstart_logs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ redirect_from: /guides/v1.0/mtf/mtf_quickstart/mtf_quickstart_logs.html
1414
All failed tests are logged in `<magento2>/dev/tests/functional/var/log`.
1515

1616
<div class="bs-callout bs-callout-tip">
17-
<p>This path is set in <code>magento2/dev/tests/functional/phpunit.xml</code>, element <code>&lt;env name="basedir" value="&lt;path_to_directory&gt;" /&gt;</code>.</p>
17+
<p>This path is set in <code>&lt;magento2&gt;/dev/tests/functional/phpunit.xml</code>, element <code>&lt;env name="basedir" value="&lt;path_to_directory&gt;" /&gt;</code>.</p>
1818
</div>
1919

2020
All Magento errors are logged in `<magento2>/var/log`.

guides/v2.0/mtf/mtf_update.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ Two types of updates are available.
1616
- <a href="#mtf_update_install">Install a new version of the Magento Testing Framework</a>
1717

1818
<div class="bs-callout bs-callout-info" id="info">
19-
<p>Use this type of update if the version of the Magento Testing Framework in <code>magento2/dev/tests/functional/composer.json</code> and last version in <code>magento2/dev/tests/functional/vendor/magento/mtf/CHANGELOG.md</code> are different. For example, when you updated Magento.</p>
19+
<p>Use this type of update if the version of the Magento Testing Framework in <code>&lt;magento2&gt;/dev/tests/functional/composer.json</code> and last version in <code>&lt;magento2&gt;/dev/tests/functional/vendor/magento/mtf/CHANGELOG.md</code> are different. For example, when you updated Magento.</p>
2020
</div>
2121

22-
- <a href="#mtf_update_depend">Update components from dependencies in <code>magento2/dev/tests/functional/composer.json</code></a>
22+
- <a href="#mtf_update_depend">Update components from dependencies in <code>&lt;magento2&gt;/dev/tests/functional/composer.json</code></a>
2323

2424
<div class="bs-callout bs-callout-info" id="info">
2525
<p>Use this type of update if you want to update dependent software from <code>composer.json</code>, or changed <code>composer.json</code> dependencies.</p>

0 commit comments

Comments
 (0)