Skip to content

Commit b500a6a

Browse files
committed
CE-33672: RequireJS has been upgraded to the latest version (2.3.6)
1 parent 2d291ad commit b500a6a

File tree

2 files changed

+204
-127
lines changed

2 files changed

+204
-127
lines changed

dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/ko/bind/datepicker.test.js

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
5+
/* eslint-disable max-nested-callbacks */
56

67
define([
78
'ko',
@@ -19,7 +20,6 @@ define([
1920
config;
2021

2122
beforeEach(function () {
22-
jasmine.clock().install();
2323
element = $('<input />');
2424
observable = ko.observable();
2525

@@ -40,7 +40,6 @@ define([
4040
});
4141

4242
afterEach(function () {
43-
jasmine.clock().uninstall();
4443
element.remove();
4544
});
4645

@@ -57,26 +56,27 @@ define([
5756
expect(todayDate).toEqual(result);
5857
});
5958

60-
it('update picked date\'s value after update observable value', function () {
59+
it('update picked date\'s value after update observable value', function (done) {
6160
var date = '06/21/2019',
6261
inputFormat = 'M/d/yy',
6362
expectedDate;
6463

6564
expectedDate = moment(date, utils.convertToMomentFormat(inputFormat)).toDate();
6665
observable(date);
67-
68-
jasmine.clock().tick(100);
69-
70-
expect(expectedDate.valueOf()).toEqual(element.datepicker('getDate').valueOf());
66+
setTimeout(function () {
67+
expect(expectedDate.valueOf()).toEqual(element.datepicker('getDate').valueOf());
68+
done();
69+
}, 100);
7170
});
7271

73-
it('clear picked date\'s value after clear observable value', function () {
72+
it('clear picked date\'s value after clear observable value', function (done) {
7473
element.datepicker('setTimezoneDate').trigger('blur').trigger('change');
7574
observable('');
7675

77-
jasmine.clock().tick(100);
78-
79-
expect(null).toEqual(element.datepicker('getDate'));
76+
setTimeout(function () {
77+
expect(null).toEqual(element.datepicker('getDate'));
78+
done();
79+
}, 100);
8080
});
8181
});
8282
});

0 commit comments

Comments
 (0)