Skip to content

Commit 51f5bcb

Browse files
author
Ji Lu
committed
Merge remote-tracking branch 'upstream/develop' into MAGETWO-22669-Change-Table-Type-To-InnoDB
2 parents b009e3d + 948f734 commit 51f5bcb

File tree

258 files changed

+11811
-2993
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

258 files changed

+11811
-2993
lines changed

‎app/code/Magento/Log/Test/Unit/Model/VisitorTest.php

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,13 +122,23 @@ public function testGetUrl()
122122
public function testGetFirstVisitAt()
123123
{
124124
$time = time();
125-
$this->assertEquals($time, $this->visitor->getFirstVisitAt());
125+
$this->assertEquals(
126+
$time,
127+
$this->visitor->getFirstVisitAt(),
128+
'VisitorTest failed to assert the time for the first visit within 5 seconds.',
129+
5
130+
);
126131
}
127132

128133
public function testGetLastVisitAt()
129134
{
130135
$time = time();
131-
$this->assertEquals($time, $this->visitor->getLastVisitAt());
136+
$this->assertEquals(
137+
$time,
138+
$this->visitor->getLastVisitAt(),
139+
'VisitorTest failed to assert the time for the last visit within 5 seconds.',
140+
5
141+
);
132142
}
133143

134144
public function testLogNewVisitor()

‎bin/magento

100644100755
File mode changed.

‎dev/tests/api-functional/config/install-config-mysql.php.dist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ return [
1212
'db_host' => 'localhost',
1313
'db_name' => 'magento_functional_tests',
1414
'db_user' => 'root',
15-
'db_pass' => '',
15+
'db_password' => '',
1616
'backend_frontname' => 'backend',
1717
'base_url' => 'http://localhost/',
1818
'use_secure' => '0',
1919
'use_rewrites' => '0',
2020
'admin_lastname' => 'Admin',
2121
'admin_firstname' => 'Admin',
2222
'admin_email' => 'admin@example.com',
23-
'admin_username' => 'admin',
23+
'admin_user' => 'admin',
2424
'admin_password' => '123123q',
2525
'admin_use_security_key' => '0',
2626
/* PayPal has limitation for order number - 20 characters. 10 digits prefix + 8 digits number is good enough */

‎dev/tests/api-functional/framework/Magento/TestFramework/WebApiApplication.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public function install()
3333

3434
/* Install application */
3535
if ($installOptions) {
36-
$installCmd = 'php -f ' . BP . '/setup/index.php install';
36+
$installCmd = 'php -f ' . BP . '/bin/magento setup:install';
3737
$installArgs = [];
3838
foreach ($installOptions as $optionName => $optionValue) {
3939
if (is_bool($optionValue)) {

‎dev/tests/functional/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"require": {
3-
"magento/mtf": "1.0.0-rc22",
3+
"magento/mtf": "1.0.0-rc23",
44
"php": "~5.5.0|~5.6.0",
55
"phpunit/phpunit": "4.1.0",
66
"phpunit/phpunit-selenium": ">=1.2",

‎dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/FormTabs.php

Lines changed: 2 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,8 @@
1313
use Magento\Mtf\Fixture\InjectableFixture;
1414
use Magento\Mtf\Client\BrowserInterface;
1515
use Magento\Mtf\Client\Element\SimpleElement;
16-
use Magento\Mtf\Util\Iterator\File;
17-
use Magento\Mtf\Util\XmlConverter;
1816

1917
/**
20-
* Class FormTabs
2118
* Is used to represent any form with tabs on the page
2219
*
2320
* @SuppressWarnings(PHPMD.NumberOfChildren)
@@ -30,11 +27,6 @@ class FormTabs extends Form
3027
*/
3128
protected $tabs = [];
3229

33-
/**
34-
* @var XmlConverter
35-
*/
36-
protected $xmlConverter;
37-
3830
/**
3931
* Fields which aren't assigned to any tab
4032
*
@@ -48,54 +40,24 @@ class FormTabs extends Form
4840
* @param Mapper $mapper
4941
* @param BlockFactory $blockFactory
5042
* @param BrowserInterface $browser
51-
* @param XmlConverter $xmlConverter
5243
* @param array $config
5344
*/
5445
public function __construct(
5546
SimpleElement $element,
5647
Mapper $mapper,
5748
BlockFactory $blockFactory,
5849
BrowserInterface $browser,
59-
XmlConverter $xmlConverter,
6050
array $config = []
6151
) {
62-
$this->xmlConverter = $xmlConverter;
6352
parent::__construct($element, $blockFactory, $mapper, $browser, $config);
6453
}
6554

6655
/**
6756
* Initialize block
6857
*/
69-
protected function _init()
58+
protected function init()
7059
{
71-
$this->tabs = $this->getTabs();
72-
}
73-
74-
/**
75-
* Get all tabs on the form
76-
*
77-
* @return array
78-
*/
79-
protected function getTabs()
80-
{
81-
$result = [];
82-
83-
$paths = glob(
84-
MTF_TESTS_PATH . preg_replace('/Magento\/\w+/', '*/*', str_replace('\\', '/', get_class($this))) . '.xml'
85-
);
86-
$files = new File($paths);
87-
88-
foreach ($files as $file) {
89-
$presetXml = simplexml_load_string($file);
90-
if ($presetXml instanceof \SimpleXMLElement) {
91-
$array = $this->xmlConverter->convert($presetXml);
92-
if (is_array($array)) {
93-
$result = array_replace_recursive($result, $array);
94-
}
95-
}
96-
}
97-
98-
return $result;
60+
$this->tabs = $this->getFormMapping();
9961
}
10062

10163
/**

‎dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/AttributeForm.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
use Magento\Mtf\Client\Element\SimpleElement;
1616
use Magento\Mtf\Client\Locator;
1717
use Magento\Mtf\Fixture\FixtureInterface;
18-
use Magento\Mtf\Util\XmlConverter;
1918

2019
/**
2120
* Edit attribute form on catalog product edit page.
@@ -49,18 +48,16 @@ class AttributeForm extends FormTabs
4948
* @param Mapper $mapper
5049
* @param BlockFactory $blockFactory
5150
* @param BrowserInterface $browser
52-
* @param XmlConverter $xmlConverter
5351
* @param array $config
5452
*/
5553
public function __construct(
5654
SimpleElement $element,
5755
Mapper $mapper,
5856
BlockFactory $blockFactory,
5957
BrowserInterface $browser,
60-
XmlConverter $xmlConverter,
6158
array $config = []
6259
) {
63-
parent::__construct($element, $mapper, $blockFactory, $browser, $xmlConverter, $config);
60+
parent::__construct($element, $mapper, $blockFactory, $browser, $config);
6461
$this->browser->switchToFrame(new Locator($this->iFrame));
6562
}
6663

‎dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Product/CatalogProductView.xml

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,16 @@
66
*/
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/pages.xsd">
9-
<page name="CatalogProductView" area="Product" mca="catalog/product/view" module="Magento_Catalog">
10-
<block name="viewBlock" class="Magento\Catalog\Test\Block\Product\View" locator="#maincontent" strategy="css selector"/>
11-
<block name="additionalInformationBlock" class="Magento\Catalog\Test\Block\Product\Additional" locator="#additional" strategy="css selector"/>
12-
<block name="customOptionsBlock" class="Magento\Catalog\Test\Block\Product\View\CustomOptions" locator="#product-options-wrapper" strategy="css selector"/>
13-
<block name="relatedProductBlock" class="Magento\Catalog\Test\Block\Product\ProductList\Related" locator=".block.related" strategy="css selector"/>
14-
<block name="upsellBlock" class="Magento\Catalog\Test\Block\Product\ProductList\Upsell" locator=".block.upsell" strategy="css selector"/>
15-
<block name="crosssellBlock" class="Magento\Catalog\Test\Block\Product\ProductList\Crosssell" locator=".block.crosssell" strategy="css selector"/>
16-
<block name="downloadableLinksBlock" class="Magento\Downloadable\Test\Block\Catalog\Product\View\Links" locator="[data-container-for=downloadable-links]" strategy="css selector"/>
17-
<block name="messagesBlock" class="Magento\Backend\Test\Block\Messages" locator=".page.messages .messages" strategy="css selector"/>
18-
<block name="reviewSummary" class="Magento\Review\Test\Block\Product\View\Summary" locator=".product-reviews-summary" strategy="css selector"/>
19-
<block name="customerReviewBlock" class="Magento\Review\Test\Block\Product\View" locator="#customer-reviews" strategy="css selector"/>
20-
<block name="reviewFormBlock" class="Magento\Review\Test\Block\Form" locator="#review-form" strategy="css selector"/>
21-
<block name="titleBlock" class="Magento\Theme\Test\Block\Html\Title" locator=".page-title-wrapper h1.page-title .base" strategy="css selector"/>
22-
<block name="widgetView" class="Magento\Widget\Test\Block\WidgetView" locator=".column.main .widget" strategy="css selector"/>
23-
</page>
9+
<page name="CatalogProductView" area="Product" mca="catalog/product/view" module="Magento_Catalog">
10+
<block name="viewBlock" class="Magento\Catalog\Test\Block\Product\View" locator="#maincontent" strategy="css selector" />
11+
<block name="additionalInformationBlock" class="Magento\Catalog\Test\Block\Product\Additional" locator="#additional" strategy="css selector" />
12+
<block name="customOptionsBlock" class="Magento\Catalog\Test\Block\Product\View\CustomOptions" locator="#product-options-wrapper" strategy="css selector" />
13+
<block name="relatedProductBlock" class="Magento\Catalog\Test\Block\Product\ProductList\Related" locator=".block.related" strategy="css selector" />
14+
<block name="upsellBlock" class="Magento\Catalog\Test\Block\Product\ProductList\Upsell" locator=".block.upsell" strategy="css selector" />
15+
<block name="crosssellBlock" class="Magento\Catalog\Test\Block\Product\ProductList\Crosssell" locator=".block.crosssell" strategy="css selector" />
16+
<block name="downloadableLinksBlock" class="Magento\Downloadable\Test\Block\Catalog\Product\View\Links" locator="[data-container-for=downloadable-links]" strategy="css selector" />
17+
<block name="messagesBlock" class="Magento\Backend\Test\Block\Messages" locator=".page.messages .messages" strategy="css selector" />
18+
<block name="titleBlock" class="Magento\Theme\Test\Block\Html\Title" locator=".page-title-wrapper h1.page-title .base" strategy="css selector" />
19+
<block name="widgetView" class="Magento\Widget\Test\Block\WidgetView" locator=".column.main .widget" strategy="css selector" />
20+
</page>
2421
</config>

‎dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,6 @@
182182
<data name="productAttribute/data/is_searchable" xsi:type="string">Yes</data>
183183
<data name="productAttribute/data/is_visible_in_advanced_search" xsi:type="string">Yes</data>
184184
<data name="productAttribute/data/is_comparable" xsi:type="string">Yes</data>
185-
<data name="issue" xsi:type="string">Bug: MAGETWO-33625</data>
186185
<constraint name="Magento\Catalog\Test\Constraint\AssertProductAttributeIsUnique" />
187186
</variation>
188187
</testCase>

‎dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/CreateCatalogRuleTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class CreateCatalogRuleTest extends AbstractCatalogRuleEntityTest
3333
const TEST_TYPE = 'acceptance_test';
3434
const MVP = 'yes';
3535
const DOMAIN = 'MX';
36-
const TO_MAINTAIN = 'yes';
36+
const TO_MAINTAIN = 'yes'; // Selecting conditions in parallel mode
3737
/* end tags */
3838

3939
/**

0 commit comments

Comments
 (0)