Skip to content

Commit d438514

Browse files
author
Bogdan Plieshka
committed
Merge branch 'develop' into UI
2 parents 7ebf039 + 252c85f commit d438514

File tree

94 files changed

+519
-284
lines changed

Some content is hidden

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

94 files changed

+519
-284
lines changed

‎app/code/Magento/PageCache/etc/varnish3.vcl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ sub vcl_recv {
5454
std.collect(req.http.Cookie);
5555

5656
# static files are always cacheable. remove SSL flag and cookie
57-
if (req.url ~ "^/(pub/)?(media|static)/.*\.(png|jpg|jpeg|gif|css|js|swf|ico|woff|svg)$") {
57+
if (req.url ~ "^/(pub/)?(media|static)/.*\.(ico|css|js|jpg|jpeg|png|gif|tiff|bmp|gz|tgz|bz2|tbz|mp3|ogg|svg|swf|woff|woff2|eot|ttf|otf)$") {
5858
unset req.http.Https;
5959
unset req.http.Cookie;
6060
}
@@ -96,7 +96,7 @@ sub vcl_fetch {
9696
# images, css and js are cacheable by default so we have to remove cookie also
9797
if (beresp.ttl > 0s && (req.request == "GET" || req.request == "HEAD")) {
9898
unset beresp.http.set-cookie;
99-
if (req.url !~ "\.(css|js|jpg|png|gif|tiff|bmp|gz|tgz|bz2|tbz|mp3|ogg|svg|swf|woff)(\?|$)") {
99+
if (req.url !~ "\.(ico|css|js|jpg|jpeg|png|gif|tiff|bmp|mp3|ogg|svg|swf|woff|woff2|eot|ttf|otf)(\?|$)") {
100100
set beresp.http.Pragma = "no-cache";
101101
set beresp.http.Expires = "-1";
102102
set beresp.http.Cache-Control = "no-store, no-cache, must-revalidate, max-age=0";

‎app/code/Magento/PageCache/etc/varnish4.vcl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ sub vcl_recv {
4747
std.collect(req.http.Cookie);
4848

4949
# static files are always cacheable. remove SSL flag and cookie
50-
if (req.url ~ "^/(pub/)?(media|static)/.*\.(png|jpg|jpeg|gif|css|js|swf|ico|woff|svg)$") {
50+
if (req.url ~ "^/(pub/)?(media|static)/.*\.(ico|css|js|jpg|jpeg|png|gif|tiff|bmp|mp3|ogg|svg|swf|woff|woff2|eot|ttf|otf)$") {
5151
unset req.http.Https;
5252
unset req.http.Cookie;
5353
}
@@ -90,7 +90,7 @@ sub vcl_backend_response {
9090
# images, css and js are cacheable by default so we have to remove cookie also
9191
if (beresp.ttl > 0s && (bereq.method == "GET" || bereq.method == "HEAD")) {
9292
unset beresp.http.set-cookie;
93-
if (bereq.url !~ "\.(css|js|jpg|png|gif|tiff|bmp|gz|tgz|bz2|tbz|mp3|ogg|svg|swf|woff)(\?|$)") {
93+
if (bereq.url !~ "\.(ico|css|js|jpg|jpeg|png|gif|tiff|bmp|gz|tgz|bz2|tbz|mp3|ogg|svg|swf|woff|woff2|eot|ttf|otf)(\?|$)") {
9494
set beresp.http.Pragma = "no-cache";
9595
set beresp.http.Expires = "-1";
9696
set beresp.http.Cache-Control = "no-store, no-cache, must-revalidate, max-age=0";

‎dev/tests/functional/bootstrap.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
session_start();
87
defined('MTF_BOOT_FILE') || define('MTF_BOOT_FILE', __FILE__);
98
defined('MTF_BP') || define('MTF_BP', str_replace('\\', '/', (__DIR__)));
109
require_once __DIR__ . '/../../../app/bootstrap.php';

‎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-rc20",
3+
"magento/mtf": "1.0.0-rc21",
44
"php": "~5.5.0|~5.6.0",
55
"phpunit/phpunit": "4.1.0",
66
"phpunit/phpunit-selenium": ">=1.2",

‎dev/tests/functional/lib/Magento/Mtf/Util/Protocol/CurlTransport/BackendDecorator.php

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
namespace Magento\Mtf\Util\Protocol\CurlTransport;
88

9-
use Magento\Mtf\Config;
9+
use Magento\Mtf\Config\DataInterface;
1010
use Magento\Mtf\Util\Protocol\CurlInterface;
1111
use Magento\Mtf\Util\Protocol\CurlTransport;
1212

@@ -40,17 +40,17 @@ class BackendDecorator implements CurlInterface
4040
/**
4141
* System config
4242
*
43-
* @var Config
43+
* @var DataInterface
4444
*/
4545
protected $configuration;
4646

4747
/**
4848
* Constructor
4949
*
5050
* @param CurlTransport $transport
51-
* @param Config $configuration
51+
* @param DataInterface $configuration
5252
*/
53-
public function __construct(CurlTransport $transport, Config $configuration)
53+
public function __construct(CurlTransport $transport, DataInterface $configuration)
5454
{
5555
$this->transport = $transport;
5656
$this->configuration = $configuration;
@@ -65,11 +65,10 @@ public function __construct(CurlTransport $transport, Config $configuration)
6565
*/
6666
protected function authorize()
6767
{
68-
$url = $_ENV['app_backend_url'] .
69-
$this->configuration->getParameter('application/backendLoginUrl');
68+
$url = $_ENV['app_backend_url'] . $this->configuration->get('application/0/backendLoginUrl/0/value');
7069
$data = [
71-
'login[username]' => $this->configuration->getParameter('application/backendLogin'),
72-
'login[password]' => $this->configuration->getParameter('application/backendPassword'),
70+
'login[username]' => $this->configuration->get('application/0/backendLogin/0/value'),
71+
'login[password]' => $this->configuration->get('application/0/backendPassword/0/value'),
7372
];
7473
$this->transport->write(CurlInterface::POST, $url, '1.0', [], $data);
7574
$response = $this->read();

‎dev/tests/functional/phpunit.xml.dist

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
</arguments>
2727
</listener>
2828
<listener class="Magento\Mtf\System\Event\StateListener" />
29-
<listener class="Magento\Mtf\System\JUnit"/>
3029
</listeners>
3130

3231
<php>
@@ -37,7 +36,6 @@
3736
<env name="log_directory" value="var/log" />
3837
<env name="events_preset" value="base" />
3938
<env name="module_whitelist" value="Magento_Install,Magento_Core" />
40-
<env name="report_file_name" value="test-cases-report.xml"/>
4139
<env name="basedir" value="var/log" />
4240
<env name="credentials_file_path" value="./credentials.xml.dist" />
4341
</php>

‎dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/Admin/SuperAdmin.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ protected function _initData()
2222
$this->_data = [
2323
'fields' => [
2424
'username' => [
25-
'value' => $this->_configuration->getParameter('application/backendLogin'),
25+
'value' => $this->_configuration->get('application/0/backendLogin/0/value'),
2626
],
2727
'password' => [
28-
'value' => $this->_configuration->getParameter('application/backendPassword'),
28+
'value' => $this->_configuration->get('application/0/backendPassword/0/value'),
2929
],
3030
],
3131
];

‎dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/GlobalSearch.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="../../../../../../vendor/magento/mtf/etc/fixture.xsd">
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/fixture.xsd">
99
<fixture name="globalSearch" module="Magento_Backend" class="Magento\Backend\Test\Fixture\GlobalSearch">
1010
<dataset name="default">
1111
<field name="query" xsi:type="string">catalogProductSimple::default::name</field>

‎dev/tests/functional/tests/app/Magento/Backend/Test/Handler/Extractor.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
namespace Magento\Backend\Test\Handler;
99

10-
use Magento\Mtf\Config;
1110
use Magento\Mtf\Util\Protocol\CurlInterface;
1211
use Magento\Mtf\Util\Protocol\CurlTransport;
1312
use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
@@ -62,8 +61,8 @@ public function __construct($url, $regExpPattern, $isAll = false)
6261
*/
6362
public function getData()
6463
{
65-
/** @var \Magento\Mtf\Config $config */
66-
$config = \Magento\Mtf\ObjectManagerFactory::getObjectManager()->get('Magento\Mtf\Config');
64+
/** @var \Magento\Mtf\Config\DataInterface $config */
65+
$config = \Magento\Mtf\ObjectManagerFactory::getObjectManager()->get('Magento\Mtf\Config\DataInterface');
6766
$url = $_ENV['app_backend_url'] . $this->url;
6867
$curl = new BackendDecorator(new CurlTransport(), $config);
6968
$curl->addOption(CURLOPT_HEADER, 1);

‎dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="../../../../../../vendor/magento/mtf/etc/fixture.xsd">
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/fixture.xsd">
99
<fixture name="bundleProduct" module="Magento_Bundle" type="eav" entity_type="catalog_product" product_type="bundle" collection="Magento\Catalog\Model\Resource\Product\Collection" identifier="sku" repository_class="Magento\Bundle\Test\Repository\BundleProduct" handler_interface="Magento\Bundle\Test\Handler\BundleProduct\BundleProductInterface" class="Magento\Bundle\Test\Fixture\BundleProduct">
1010
<dataset name="default">
1111
<field name="name" xsi:type="string">BundleProduct %isolation%</field>

0 commit comments

Comments
 (0)