Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Admixer adapter update - add deal id #6042

Merged
merged 16 commits into from
Dec 1, 2020
Merged

Admixer adapter update - add deal id #6042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
0b48ea9
Migrating to Prebid 1.0
Oct 24, 2017
6ec18f4
Migrating to Prebid 1.0
Dec 11, 2017
63928ed
Fix spec
Dec 11, 2017
1adaf95
Merge branch 'master1'
Dec 19, 2017
f24a281
Merge remote-tracking branch 'Prebid.js/master'
Galphimbl Apr 27, 2020
961c25f
add gdpr and usp
Galphimbl Apr 27, 2020
81b156e
remove changes in gdpr_hello_world.html
Galphimbl Apr 27, 2020
c5831c7
Merge remote-tracking branch 'Prebid.js/master'
Galphimbl Apr 28, 2020
3315d3c
Update gdpr_hello_world.html
Galphimbl May 5, 2020
020d732
Merge branch 'prebid.js-master'
Galphimbl Sep 7, 2020
9a99ceb
Merge branch 'prebid.js-master'
Galphimbl Nov 23, 2020
891faba
add user syncs
Galphimbl Nov 24, 2020
ee38d00
remove comments
Galphimbl Nov 24, 2020
dfd97f6
tests
Galphimbl Nov 25, 2020
b377bb0
Merge branch 'prebid.js-master'
Galphimbl Nov 27, 2020
d0ded5d
add-deal-id
Galphimbl Nov 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions modules/admixerBidAdapter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ export const spec = {
netRevenue: bidResponse.netRevenue,
currency: bidResponse.currency,
vastUrl: bidResponse.vastUrl,
dealId: bidResponse.dealId,
};
bidResponses.push(bidResp);
});
Expand Down
4 changes: 3 additions & 1 deletion test/spec/modules/admixerBidAdapter_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@ describe('AdmixerAdapter', function () {
'creativeId': 'ccca3e5e-0c54-4761-9667-771322fbdffc',
'ttl': 360,
'netRevenue': false,
'bidId': '5e4e763b6bc60b'
'bidId': '5e4e763b6bc60b',
'dealId': 'asd123',
}]
}
};
Expand All @@ -107,6 +108,7 @@ describe('AdmixerAdapter', function () {
'currency': ads[0].currency,
'netRevenue': ads[0].netRevenue,
'ttl': ads[0].ttl,
'dealId': ads[0].dealId,
}
];

Expand Down