Skip to content

Commit 8ceb826

Browse files
author
Joan He
committed
Merge remote-tracking branch 'upstream/2.3.0-release' into 2.3.0-release-sync
2 parents 9186f4a + 4deaaa2 commit 8ceb826

File tree

7 files changed

+80
-58
lines changed

7 files changed

+80
-58
lines changed

app/code/Magento/Customer/etc/db_schema.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,7 @@
506506
<column xsi:type="int" name="customer_id" padding="11" unsigned="false" nullable="true" identity="false"
507507
comment="Customer Id"/>
508508
<column xsi:type="varchar" name="session_id" nullable="true" length="64" comment="Session ID"/>
509-
<column xsi:type="timestamp" name="last_visit_at" on_update="true" nullable="true" default="CURRENT_TIMESTAMP"
509+
<column xsi:type="timestamp" name="last_visit_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
510510
comment="Last Visit Time"/>
511511
<constraint xsi:type="primary" referenceId="PRIMARY">
512512
<column name="visitor_id"/>

app/code/Magento/Integration/etc/db_schema.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
comment="User type (admin or customer)"/>
137137
<column xsi:type="smallint" name="failures_count" padding="5" unsigned="true" nullable="true" identity="false"
138138
default="0" comment="Number of failed authentication attempts in a row"/>
139-
<column xsi:type="timestamp" name="lock_expires_at" on_update="true" nullable="true" default="CURRENT_TIMESTAMP"
139+
<column xsi:type="timestamp" name="lock_expires_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
140140
comment="Lock expiration time"/>
141141
<constraint xsi:type="primary" referenceId="PRIMARY">
142142
<column name="log_id"/>

app/code/Magento/Sales/etc/db_schema.xml

Lines changed: 53 additions & 53 deletions
Large diffs are not rendered by default.

dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Product/Composite/Configure.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
-->
88
<mapping strict="0">
99
<fields>
10-
<qty />
1110
<checkbox>
1211
<selector>div[contains(@class,"field choice") and label[contains(.,"%product_name%")]]//input</selector>
1312
<strategy>xpath</strategy>

dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Composite/Configure.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
-->
88
<mapping strict="0">
99
<fields>
10-
<qty />
1110
<attribute>
1211
<selector>//div[@class="product-options"]//label[.="%s"]//following-sibling::*//select</selector>
1312
<strategy>xpath</strategy>

dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Product/Composite/Configure.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
-->
88
<mapping strict="0">
99
<fields>
10-
<qty />
1110
<link>
1211
<selector>//*[@id="downloadable-links-list"]/*[contains(.,"%link_name%")]//input</selector>
1312
<strategy>xpath</strategy>
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
declare(strict_types=1);
7+
8+
9+
namespace Magento\Integration\Block\Adminhtml\System\Config;
10+
11+
class OauthSectionTest extends \Magento\TestFramework\TestCase\AbstractBackendController
12+
{
13+
/**
14+
* Checks that OAuth Section in the system config is loaded
15+
*/
16+
public function testOAuthSection()
17+
{
18+
$this->dispatch('backend/admin/system_config/edit/section/oauth/');
19+
$body = $this->getResponse()->getBody();
20+
$this->assertContains('id="oauth_access_token_lifetime-head"', $body);
21+
$this->assertContains('id="oauth_cleanup-head"', $body);
22+
$this->assertContains('id="oauth_consumer-head"', $body);
23+
$this->assertContains('id="oauth_authentication_lock-head"', $body);
24+
}
25+
}

0 commit comments

Comments
 (0)