Skip to content

Commit a25aa97

Browse files
committed
test: Correct syntax for tests to not break IE10/11 and Mobile
1 parent 622021e commit a25aa97

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

test/raven.test.js

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -828,7 +828,7 @@ describe('globals', function() {
828828
});
829829

830830
Raven._globalProject = '2';
831-
Object.assign(Raven._globalOptions, {
831+
utils.objectMerge(Raven._globalOptions, {
832832
logger: 'javascript',
833833
maxMessageLength: 100
834834
});
@@ -875,7 +875,7 @@ describe('globals', function() {
875875
});
876876

877877
Raven._globalProject = '2';
878-
Object.assign(Raven._globalOptions, {
878+
utils.objectMerge(Raven._globalOptions, {
879879
logger: 'javascript',
880880
maxMessageLength: 100,
881881
autoBreadcrumbs: {
@@ -979,7 +979,7 @@ describe('globals', function() {
979979
});
980980

981981
Raven._globalProject = '2';
982-
Object.assign(Raven._globalOptions, {
982+
utils.objectMerge(Raven._globalOptions, {
983983
logger: 'javascript',
984984
maxMessageLength: 100,
985985
autoBreadcrumbs: false
@@ -1014,7 +1014,7 @@ describe('globals', function() {
10141014
});
10151015

10161016
Raven._globalProject = '2';
1017-
Object.assign(Raven._globalOptions, {
1017+
utils.objectMerge(Raven._globalOptions, {
10181018
logger: 'javascript',
10191019
maxMessageLength: 100
10201020
});
@@ -1110,7 +1110,7 @@ describe('globals', function() {
11101110
this.sinon.stub(Raven, 'isSetup').returns(true);
11111111
this.sinon.stub(Raven, '_makeRequest');
11121112

1113-
Object.assign(Raven._globalOptions, {
1113+
utils.objectMerge(Raven._globalOptions, {
11141114
projectId: 2,
11151115
logger: 'javascript',
11161116
maxMessageLength: 100,
@@ -1136,7 +1136,7 @@ describe('globals', function() {
11361136
});
11371137

11381138
Raven._globalProject = '2';
1139-
Object.assign(Raven._globalOptions, {
1139+
utils.objectMerge(Raven._globalOptions, {
11401140
logger: 'javascript',
11411141
maxMessageLength: 100,
11421142
dataCallback: function() {
@@ -1191,7 +1191,7 @@ describe('globals', function() {
11911191
headers: {'User-Agent': 'lolbrowser'}
11921192
});
11931193

1194-
Object.assign(Raven._globalOptions, {
1194+
utils.objectMerge(Raven._globalOptions, {
11951195
projectId: 2,
11961196
logger: 'javascript',
11971197
maxMessageLength: 100,
@@ -1231,7 +1231,7 @@ describe('globals', function() {
12311231
headers: {'User-Agent': 'lolbrowser'}
12321232
});
12331233

1234-
Object.assign(Raven._globalOptions, {
1234+
utils.objectMerge(Raven._globalOptions, {
12351235
projectId: 2,
12361236
logger: 'javascript',
12371237
maxMessageLength: 100,
@@ -1264,7 +1264,7 @@ describe('globals', function() {
12641264
headers: {'User-Agent': 'lolbrowser'}
12651265
});
12661266

1267-
Object.assign(Raven._globalOptions, {
1267+
utils.objectMerge(Raven._globalOptions, {
12681268
projectId: 2,
12691269
logger: 'javascript',
12701270
maxMessageLength: 100,
@@ -1297,7 +1297,7 @@ describe('globals', function() {
12971297
headers: {'User-Agent': 'lolbrowser'}
12981298
});
12991299

1300-
Object.assign(Raven._globalOptions, {
1300+
utils.objectMerge(Raven._globalOptions, {
13011301
projectId: 2,
13021302
logger: 'javascript',
13031303
maxMessageLength: 100,
@@ -1330,7 +1330,7 @@ describe('globals', function() {
13301330
headers: {'User-Agent': 'lolbrowser'}
13311331
});
13321332

1333-
var globalOptions = Object.assign({}, Raven._globalOptions, {
1333+
var globalOptions = utils.objectMerge(Raven._globalOptions, {
13341334
projectId: 2,
13351335
logger: 'javascript',
13361336
maxMessageLength: 100,
@@ -1379,7 +1379,7 @@ describe('globals', function() {
13791379
});
13801380

13811381
Raven._globalEndpoint = 'http://localhost/store/';
1382-
Object.assign(Raven._globalOptions, {
1382+
utils.objectMerge(Raven._globalOptions, {
13831383
projectId: 2,
13841384
logger: 'javascript',
13851385
maxMessageLength: 100,
@@ -1422,7 +1422,7 @@ describe('globals', function() {
14221422
headers: {'User-Agent': 'lolbrowser'}
14231423
});
14241424

1425-
var globalOptions = Object.assign({}, Raven._globalOptions, {
1425+
var globalOptions = utils.objectMerge(Raven._globalOptions, {
14261426
logger: 'javascript',
14271427
maxMessageLength: 100,
14281428
transport: sinon.stub()
@@ -1453,7 +1453,7 @@ describe('globals', function() {
14531453
this.sinon.stub(window, 'fetch').resolves(true);
14541454

14551455
Raven._globalProject = '2';
1456-
Object.assign(Raven._globalOptions, {
1456+
utils.objectMerge(Raven._globalOptions, {
14571457
logger: 'javascript',
14581458
maxMessageLength: 100,
14591459
headers: {
@@ -1472,7 +1472,7 @@ describe('globals', function() {
14721472
this.sinon.stub(window, 'fetch').resolves(true);
14731473

14741474
Raven._globalProject = '2';
1475-
Object.assign(Raven._globalOptions, {
1475+
utils.objectMerge(Raven._globalOptions, {
14761476
logger: 'javascript',
14771477
maxMessageLength: 100,
14781478
headers: {
@@ -1501,7 +1501,7 @@ describe('globals', function() {
15011501
requests.push(xhr);
15021502
};
15031503

1504-
Object.assign(Raven._globalOptions, {
1504+
utils.objectMerge(Raven._globalOptions, {
15051505
headers: {
15061506
'custom-string-header': 'pickle-rick',
15071507
'custom-function-header': function() {
@@ -1698,7 +1698,7 @@ describe('globals', function() {
16981698
});
16991699

17001700
Raven._globalProject = '2';
1701-
Object.assign(Raven._globalOptions, {
1701+
utils.objectMerge(Raven._globalOptions, {
17021702
logger: 'javascript',
17031703
maxMessageLength: 100
17041704
});
@@ -1743,7 +1743,7 @@ describe('globals', function() {
17431743
});
17441744

17451745
Raven._globalProject = '2';
1746-
Object.assign(Raven._globalOptions, {
1746+
utils.objectMerge(Raven._globalOptions, {
17471747
logger: 'javascript',
17481748
maxMessageLength: 100
17491749
});
@@ -1794,7 +1794,7 @@ describe('globals', function() {
17941794
});
17951795

17961796
Raven._globalProject = '2';
1797-
Object.assign(Raven._globalOptions, {
1797+
utils.objectMerge(Raven._globalOptions, {
17981798
logger: 'javascript',
17991799
maxMessageLength: 100
18001800
});

0 commit comments

Comments
 (0)