Skip to content

Commit cdc982a

Browse files
committed
MAGETWO-89675: Build Stabilization
Restore $.ajax in JSUnit tests
1 parent 644464f commit cdc982a

File tree

4 files changed

+26
-7
lines changed

4 files changed

+26
-7
lines changed

dev/tests/js/jasmine/tests/app/code/Magento/Catalog/adminhtml/js/components/product-ui-select.test.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,12 @@ define([
1313
'use strict';
1414

1515
describe('Magento_Catalog/js/components/product-ui-select', function () {
16-
var obj;
16+
var obj,
17+
originaljQueryAjax;
1718

1819
beforeEach(function () {
20+
originaljQueryAjax = $.ajax;
21+
1922
obj = new Constr({
2023
name: 'productUiSelect',
2124
dataScope: '',
@@ -25,6 +28,10 @@ define([
2528
});
2629
});
2730

31+
afterEach(function () {
32+
$.ajax = originaljQueryAjax;
33+
});
34+
2835
describe('"validateInitialValue" method', function () {
2936
it('Should be defined', function () {
3037
expect(obj.hasOwnProperty('validateInitialValue')).toBeDefined();

dev/tests/js/jasmine/tests/app/code/Magento/Review/view/frontend/web/js/process-review.test.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,21 @@ define([
1414

1515
describe('Test product page reviews processor', function () {
1616
var element,
17-
config = {
18-
reviewsTabSelector: '#review-tab'
19-
};
17+
originaljQueryAjax,
18+
config = {
19+
reviewsTabSelector: '#review-tab'
20+
};
2021

2122
beforeEach(function () {
2223
element = $('<div id="review-tab" role="tab"></div>');
2324

2425
$('body').append(element);
26+
originaljQueryAjax = $.ajax;
2527
});
2628

2729
afterEach(function () {
2830
element.remove();
31+
$.ajax = originaljQueryAjax;
2932
});
3033

3134
it('Should automatically load reviews after page load if review tab is active', function () {

dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/client.test.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ define([
2020
index: ''
2121
}),
2222
jQueryMethods = {},
23-
ajax = $.ajax;
23+
originaljQueryAjax;
2424

2525
window.FORM_KEY = 'magentoFormKey';
2626

@@ -38,11 +38,15 @@ define([
3838
}
3939
});
4040

41+
beforeEach(function () {
42+
originaljQueryAjax = $.ajax;
43+
});
44+
4145
afterEach(function () {
4246
_.each(jQueryMethods, function (value, key) {
4347
$.fn[key] = value;
4448
});
45-
$.ajax = ajax;
49+
4650
});
4751

4852
describe('"save" method', function () {

dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/ui-select.test.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ define([
1414
'use strict';
1515

1616
describe('Magento_Ui/js/form/element/ui-select', function () {
17-
var obj;
17+
var obj, originaljQueryAjax;
1818

1919
beforeEach(function () {
2020
obj = new Constr({
@@ -25,6 +25,11 @@ define([
2525

2626
obj.value = ko.observableArray([]);
2727
obj.cacheOptions.plain = [];
28+
originaljQueryAjax = $.ajax;
29+
});
30+
31+
afterEach(function () {
32+
$.ajax = originaljQueryAjax;
2833
});
2934

3035
describe('"initialize" method', function () {

0 commit comments

Comments
 (0)