Skip to content

Commit 9c9461a

Browse files
committed
Merge remote-tracking branch 'origin/MAGETWO-52958-1' into MAGETWO-52958-1
2 parents e924efb + 80ed824 commit 9c9461a

File tree

14 files changed

+39
-40
lines changed

14 files changed

+39
-40
lines changed

app/code/Magento/Ui/view/base/web/js/lib/logger/console-output-handler.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
2+
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
55

app/code/Magento/Ui/view/base/web/js/lib/logger/entry-factory.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
2+
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
55

app/code/Magento/Ui/view/base/web/js/lib/logger/entry.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
2+
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
55

app/code/Magento/Ui/view/base/web/js/lib/logger/formatter.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
2+
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
55

app/code/Magento/Ui/view/base/web/js/lib/logger/levels-pool.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
2+
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
55

app/code/Magento/Ui/view/base/web/js/lib/logger/logger-utils.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
2+
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
55

app/code/Magento/Ui/view/base/web/js/lib/logger/logger.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
2+
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
55

dev/tests/js/jasmine/tests/app/code/Magento/Analytics/adminhtml/js/modal/modal-component.test.js

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -17,35 +17,34 @@ define([
1717
},
1818
obj;
1919

20-
beforeEach(function (done) {
21-
injector.mock(mocks);
22-
injector.require(['Magento_Analytics/js/modal/modal-component'], function (Constr) {
23-
obj = new Constr({
24-
provider: 'provName',
25-
name: '',
26-
index: '',
27-
links: '',
28-
listens: '',
29-
30-
/**
31-
* @return {Object} source - mock for form data
32-
*/
33-
form: function () {
34-
return {
35-
source: {
36-
data: {}
37-
}
38-
};
39-
}
20+
describe('Magento_Analytics/js/modal/modal-component', function () {
21+
beforeEach(function (done) {
22+
injector.mock(mocks);
23+
injector.require(['Magento_Analytics/js/modal/modal-component'], function (Constr) {
24+
obj = new Constr({
25+
provider: 'provName',
26+
name: '',
27+
index: '',
28+
links: '',
29+
listens: '',
30+
31+
/**
32+
* @return {Object} source - mock for form data
33+
*/
34+
form: function () {
35+
return {
36+
source: {
37+
data: {}
38+
}
39+
};
40+
}
41+
});
42+
done();
4043
});
41-
done();
4244
});
43-
});
44-
45-
xdescribe('Magento_Analytics/js/modal/modal-component', function () {
4645
describe('"sendPostponeRequest" method', function () {
4746
it('should send a ajax request', function () {
48-
spyOn(jQuery, 'ajax').and.callFake(function () {
47+
jQuery.ajax = jasmine.createSpy().and.callFake(function () {
4948
var d = $.Deferred();
5049

5150
d.resolve({
@@ -62,7 +61,7 @@ define([
6261

6362
it('should call "onError" method if ajax received error', function () {
6463
spyOn(obj, 'onError');
65-
spyOn(jQuery, 'ajax').and.callFake(function () {
64+
jQuery.ajax = jasmine.createSpy().and.callFake(function () {
6665
var d = $.Deferred();
6766

6867
d.resolve({
@@ -80,7 +79,7 @@ define([
8079

8180
it('should call "onError" method if request failed', function () {
8281
spyOn(obj, 'onError');
83-
spyOn(jQuery, 'ajax').and.callFake(function () {
82+
jQuery.ajax = jasmine.createSpy().and.callFake(function () {
8483
var d = $.Deferred();
8584

8685
d.reject();

dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/logger/console-logger.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
2+
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
55
/* eslint-disable max-nested-callbacks */

dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/logger/console-output-handler.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
2+
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
55
/* eslint-disable max-nested-callbacks */

0 commit comments

Comments
 (0)