Skip to content

Commit 28f2895

Browse files
author
Michele Nasti
committed
fix broken test introduced with prebid#171 
1 parent 3e65d08 commit 28f2895

File tree

2 files changed

+44
-40
lines changed

2 files changed

+44
-40
lines changed

‎.vscode/settings.json

+20-22
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,21 @@
11
{
2-
"workbench.colorCustomizations": {
3-
"activityBar.activeBackground": "#3e46cf",
4-
"activityBar.activeBorder": "#d9666c",
5-
"activityBar.background": "#3e46cf",
6-
"activityBar.foreground": "#e7e7e7",
7-
"activityBar.inactiveForeground": "#e7e7e799",
8-
"activityBarBadge.background": "#d9666c",
9-
"activityBarBadge.foreground": "#15202b",
10-
"sash.hoverBorder": "#3e46cf",
11-
"statusBar.background": "#2b33af",
12-
"statusBar.foreground": "#e7e7e7",
13-
"statusBarItem.hoverBackground": "#3e46cf",
14-
"statusBarItem.remoteBackground": "#2b33af",
15-
"statusBarItem.remoteForeground": "#e7e7e7",
16-
"titleBar.activeBackground": "#2b33af",
17-
"titleBar.activeForeground": "#e7e7e7",
18-
"titleBar.inactiveBackground": "#2b33af99",
19-
"titleBar.inactiveForeground": "#e7e7e799",
20-
"commandCenter.border": "#e7e7e799"
21-
},
22-
"peacock.color": "#2b33af"
23-
}
2+
"workbench.colorCustomizations": {
3+
"activityBar.activeBackground": "#3e46cf",
4+
"activityBar.activeBorder": "#d9666c",
5+
"activityBar.background": "#3e46cf",
6+
"activityBar.foreground": "#e7e7e7",
7+
"activityBar.inactiveForeground": "#e7e7e799",
8+
"activityBarBadge.background": "#d9666c",
9+
"activityBarBadge.foreground": "#15202b",
10+
"sash.hoverBorder": "#3e46cf",
11+
"statusBar.background": "#2b33af",
12+
"statusBar.foreground": "#e7e7e7",
13+
"statusBarItem.hoverBackground": "#3e46cf",
14+
"statusBarItem.remoteBackground": "#2b33af",
15+
"statusBarItem.remoteForeground": "#e7e7e7",
16+
"titleBar.activeBackground": "#2b33af",
17+
"titleBar.activeForeground": "#e7e7e7",
18+
"titleBar.inactiveBackground": "#2b33af99"
19+
},
20+
"peacock.color": "#2b33af"
21+
}

‎test/spec/nativeAssetManager_spec.js

+24-18
Original file line numberDiff line numberDiff line change
@@ -487,35 +487,41 @@ describe('nativeAssetManager', () => {
487487
}
488488

489489
sinon.stub(utils, 'sendRequest').callsFake(function(arg1, cb) {
490-
let response = JSON.stringify({ id: '6572251357847878203',
491-
impid: 'some-imp-id',
492-
price: 10,
493-
adm: '{"assets":[{"id":1,"img":{"type":3,"url":"http://vcdn.adnxs.com/p/creative-image/f8/7f/0f/13/f87f0f13-230c-4f05-8087-db9216e393de.jpg","w":989,"h":742,"ext":{"appnexus":{"prevent_crop":0}}}},{"title":{"text":"This is a Prebid Native Creative"}},{"id":2,"data":{"type":1,"value":"Prebid.org"}},{"id":3,"data":{"type":2,"value":"new value"}}],"link":{"url":"http://example.com"},"imptrackers":["http://some-tracker.com"],"jstracker":"\\u003cscript type=\\"text/javascript\\" async=\\"true\\" src=\\"http://cdn.adnxs.com/v/app/179/trk.js#app;vk=appnexus.com-omid;tv=app-native-23h;dom_id=%native_dom_id%;st=2;d=1x1;vc=iab;vid_ccr=1;tag_id=13232354;cb=http%3A%2F%2Fnym1-ib.adnxs.com%2Fvevent%3Fan_audit%3D0%26test%3D1%26e%3DwqT_3QLXB2zXAwAAAwDWAAUBCJqev-0FEN2mtMzg8dSSPxj_EQEQASo2CQAFAQgkQBEFCAwAJEAZEQkAIREJACkRCQAxEQmoMOLRpwY47UhA7UhIAlC8yb4uWJzxW2AAaM26dXjjrAWAAQGKAQNVU0SSAQEG8FKYAQGgAQGoAQGwAQC4AQLAAQPIAQLQAQDYAQDgAQHwAQCKAjt1ZignYScsIDI1Mjk4ODUsIDE1NzE4MDI5MDYpO3VmKCdyJywgOTc0OTQyMDQsIC4eAPQOAZICuQIhTEVEX1hnajgtTHdLRUx6SnZpNFlBQ0NjOFZzd0FEZ0FRQVJJN1VoUTR0R25CbGdBWVBfX19fOFBhQUJ3QVhnQmdBRUJpQUVCa0FFQm1BRUJvQUVCcUFFRHNBRUF1UUh6cldxa0FBQWtRTUVCODYxcXBBQUFKRURKQWJSM21tYW5MdWNfMlFFQUFBQUFBQUR3UC1BQkFQVUJBQUFBQUpnQ0FLQUNBTFVDQUFBQUFMMENBQUFBQU1BQ0FjZ0NBZEFDQWRnQ0FlQUNBT2dDQVBnQ0FJQURBWmdEQWFnRF9QaThDcm9EQ1U1WlRUSTZORFl6Tk9BRHBSU0lCQUNRQkFDWUJBSEJCQUFBQUEJgwh5UVEJCQEBGE5nRUFQRUUBCwkBUEQ0QkFDSUJab2uaAokBIVp3LWhMQTY9ASRuUEZiSUFRb0FEFThUa1FEb0pUbGxOTWpvME5qTTBRS1VVUxFoDFBBX1URDAxBQUFXHQwAWR0MAGEdDABjHQzweWVBQS7YAgDgAq2YSIADAYgDAJADAJgDFKADAaoDAMAD4KgByAMA2AMA4AMA6AMC-AMAgAQAkgQJL29wZW5ydGIymAQAqAQAsgQMCAAQABgAIAAwADgAuAQAwAQAyAQA0gQOOTMyNSNOWU0yOjQ2MzTaBAIIAeAEAPAEQcCQggUab3JnLnByZWJpZC5tb2JpbGUuYXBpMWRlbW-IBQGYBQCgBXE4QP8BqgUHc29tZS1pZMAFAMkFaRgU8D_SBQkJCQw8AADYBQHgBQHwBZn0IfoFBAGUKJAGAZgGALgGAMEGCSU48D_IBgDQBvUv2gYWChAAOgEAUBAAGADgBgzyBgIIAIAHAYgHAKAHQQ..%26s%3Da7b19f6eede870d487a7bec88354794855bf8161;ts=1571802906;cet=0;cecb=\\"\\u003e\\u003c/script\\u003e\", \"eventtrackers\":[{\"type\": 1, \"method\": 1, \"url\": \"eventtracker-image\"},{\"type\": 1, \"method\": 2, \"url\": \"eventtracker-js\"}]}',
494-
adid: '97494204',
495-
adomain: [ 'http://prebid.org' ],
496-
iurl: 'http://nym1-ib.adnxs.com/cr?id=97494204',
497-
cid: '9325',
498-
crid: '97494204',
499-
cat: [ 'IAB3-1' ],
500-
ext:
501-
{ appnexus:
502-
{ brand_id: 555545,
503-
auction_id: 4550134868038456300,
504-
bidder_id: 2,
505-
bid_ad_type: 3 } } });
490+
let response = JSON.stringify({
491+
id: '6572251357847878203',
492+
impid: 'some-imp-id',
493+
price: 10,
494+
adm: '{"assets":[{"id":1,"img":{"type":3,"url":"http://vcdn.adnxs.com/p/creative-image/f8/7f/0f/13/f87f0f13-230c-4f05-8087-db9216e393de.jpg","w":989,"h":742,"ext":{"appnexus":{"prevent_crop":0}}}},{"title":{"text":"This is a Prebid Native Creative"}},{"id":2,"data":{"type":1,"value":"Prebid.org"}},{"id":3,"data":{"type":2,"value":"new value"}}],"link":{"url":"http://example.com"},"imptrackers":["http://some-tracker.com"],"jstracker":"\\u003cscript type=\\"text/javascript\\" async=\\"true\\" src=\\"http://cdn.adnxs.com/v/app/179/trk.js#app;vk=appnexus.com-omid;tv=app-native-23h;dom_id=%native_dom_id%;st=2;d=1x1;vc=iab;vid_ccr=1;tag_id=13232354;cb=http%3A%2F%2Fnym1-ib.adnxs.com%2Fvevent%3Fan_audit%3D0%26test%3D1%26e%3DwqT_3QLXB2zXAwAAAwDWAAUBCJqev-0FEN2mtMzg8dSSPxj_EQEQASo2CQAFAQgkQBEFCAwAJEAZEQkAIREJACkRCQAxEQmoMOLRpwY47UhA7UhIAlC8yb4uWJzxW2AAaM26dXjjrAWAAQGKAQNVU0SSAQEG8FKYAQGgAQGoAQGwAQC4AQLAAQPIAQLQAQDYAQDgAQHwAQCKAjt1ZignYScsIDI1Mjk4ODUsIDE1NzE4MDI5MDYpO3VmKCdyJywgOTc0OTQyMDQsIC4eAPQOAZICuQIhTEVEX1hnajgtTHdLRUx6SnZpNFlBQ0NjOFZzd0FEZ0FRQVJJN1VoUTR0R25CbGdBWVBfX19fOFBhQUJ3QVhnQmdBRUJpQUVCa0FFQm1BRUJvQUVCcUFFRHNBRUF1UUh6cldxa0FBQWtRTUVCODYxcXBBQUFKRURKQWJSM21tYW5MdWNfMlFFQUFBQUFBQUR3UC1BQkFQVUJBQUFBQUpnQ0FLQUNBTFVDQUFBQUFMMENBQUFBQU1BQ0FjZ0NBZEFDQWRnQ0FlQUNBT2dDQVBnQ0FJQURBWmdEQWFnRF9QaThDcm9EQ1U1WlRUSTZORFl6Tk9BRHBSU0lCQUNRQkFDWUJBSEJCQUFBQUEJgwh5UVEJCQEBGE5nRUFQRUUBCwkBUEQ0QkFDSUJab2uaAokBIVp3LWhMQTY9ASRuUEZiSUFRb0FEFThUa1FEb0pUbGxOTWpvME5qTTBRS1VVUxFoDFBBX1URDAxBQUFXHQwAWR0MAGEdDABjHQzweWVBQS7YAgDgAq2YSIADAYgDAJADAJgDFKADAaoDAMAD4KgByAMA2AMA4AMA6AMC-AMAgAQAkgQJL29wZW5ydGIymAQAqAQAsgQMCAAQABgAIAAwADgAuAQAwAQAyAQA0gQOOTMyNSNOWU0yOjQ2MzTaBAIIAeAEAPAEQcCQggUab3JnLnByZWJpZC5tb2JpbGUuYXBpMWRlbW-IBQGYBQCgBXE4QP8BqgUHc29tZS1pZMAFAMkFaRgU8D_SBQkJCQw8AADYBQHgBQHwBZn0IfoFBAGUKJAGAZgGALgGAMEGCSU48D_IBgDQBvUv2gYWChAAOgEAUBAAGADgBgzyBgIIAIAHAYgHAKAHQQ..%26s%3Da7b19f6eede870d487a7bec88354794855bf8161;ts=1571802906;cet=0;cecb=\\"\\u003e\\u003c/script\\u003e\", \"eventtrackers\":[{\"type\": 1, \"method\": 1, \"url\": \"eventtracker-image\"},{\"type\": 1, \"method\": 2, \"url\": \"eventtracker-js\"}]}',
495+
adid: '97494204',
496+
adomain: [ 'http://prebid.org' ],
497+
iurl: 'http://nym1-ib.adnxs.com/cr?id=97494204',
498+
cid: '9325',
499+
crid: '97494204',
500+
cat: [ 'IAB3-1' ],
501+
ext: {
502+
appnexus: {
503+
brand_id: 555545,
504+
auction_id: 4550134868038456300,
505+
bidder_id: 2,
506+
bid_ad_type: 3
507+
}
508+
}
509+
});
506510
cb(response);
507511
});
508512

509513
const nativeAssetManager = makeManager();
510514
nativeAssetManager.loadMobileAssets(targetingData, cb);
511515

516+
utils.sendRequest.restore();
517+
512518
expect(win.document.body.innerHTML).to.include('<p>new value</p>');
513519
expect(win.document.body.innerHTML).to.include(`
514520
<a href="http://example.com">Click Here</a>
515521
`);
516522
// cta was not in the response so it should default to an empty string
517-
expect(win.document.body.innerHTML).to.include('<h1></h1>');
518-
expect(cb.getCall(0).args[0]).to.haveOwnProperty('eventtrackers');
523+
expect(win.document.body.innerHTML).to.include('<h1></h1>');
524+
expect(cb.getCall(0).args[0]).to.haveOwnProperty('eventtrackers');
519525
utils.sendRequest.restore();
520526
})
521527
})

0 commit comments

Comments
 (0)