Skip to content

Commit c08fd7f

Browse files
committed
AC-1199::Fixed funtional tests - Incompatibility issue resolve after remove Jquery Migrate
1 parent c344907 commit c08fd7f

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

app/code/Magento/CheckoutAgreements/Test/Mftf/Test/AdminDeleteActiveTextTermEntityTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<group value="mtf_migrated"/>
2121
</annotations>
2222
<before>
23+
<magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
2324
<magentoCLI command="config:set checkout/options/enable_agreements 1" stepKey="setEnableTermsOnCheckout"/>
2425
<actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin" />
2526
<createData entity="SimpleTwo" stepKey="createdProduct"/>
@@ -30,6 +31,8 @@
3031
<actionGroup ref="AdminTermsConditionsSaveTermActionGroup" stepKey="saveNewTerm"/>
3132
</before>
3233
<after>
34+
<!-- Disable shipping method for customer with default address -->
35+
<magentoCLI command="config:set {{DisableFlatRateConfigData.path}} {{DisableFlatRateConfigData.value}}" stepKey="disableFlatRate"/>
3336
<magentoCLI command="config:set checkout/options/enable_agreements 0" stepKey="setDisableTermsOnCheckout"/>
3437
<deleteData createDataKey="createdProduct" stepKey="deletedProduct"/>
3538
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>

app/code/Magento/Swatches/view/adminhtml/web/js/visual.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,6 +362,7 @@ define([
362362
* @this {iframe}
363363
*/
364364
iframeHandler = function () {
365+
console.log($(this).contents().find('body').html());
365366
var imageParams = $.parseJSON($(this).contents().find('body').html()),
366367
fullMediaUrl = imageParams['swatch_path'] + imageParams['file_path'];
367368

@@ -374,7 +375,7 @@ define([
374375
};
375376

376377
swatchComponents.iframe.off('load');
377-
swatchComponents.iframe.load(iframeHandler);
378+
swatchComponents.iframe.on('load', iframeHandler);
378379
swatchComponents.form.submit();
379380
$(this).val('');
380381
});

0 commit comments

Comments
 (0)