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

Just Premium: add format parameter (issue #2691) #2693

Merged
merged 48 commits into from
Jun 11, 2018
Merged

Just Premium: add format parameter (issue #2691) #2693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
8aa8f9c
Justpremium adapter and unit tests.
mkalafior May 24, 2017
00a2ce6
Fix test suit.
mkalafior May 24, 2017
0816e98
Performance improvements.
mkalafior Jun 6, 2017
6cc1617
Changes requested in pull request review.
mkalafior Jun 27, 2017
4917b85
Merge with upstream
mkalafior Jun 27, 2017
5fefb28
Register justpremium adapter in adaptermanager
mkalafior Jun 27, 2017
92da906
Merge remote-tracking branch 'upstream/master'
mkalafior Jul 3, 2017
83d5022
Merge branch 'master' of https://github.com/prebid/Prebid.js
mkalafior Jul 20, 2017
16a7b42
pass through bid from request
mkalafior Jul 20, 2017
b943b79
Merge branch 'master' of https://github.com/prebid/Prebid.js
mkalafior Aug 2, 2017
d8ddfd0
fix linting errors
mkalafior Aug 2, 2017
62438ed
merge
mkalafior Oct 12, 2017
d8e5cf8
Load polyfills for older browsers
mkalafior Oct 17, 2017
1eb433a
Merge remote-tracking branch 'upstream/master'
mkalafior Oct 17, 2017
97b0dd7
Merge branch 'master' into bugfix/ie-polyfills
mkalafior Oct 17, 2017
4683a30
Load polyfills if older browser
mkalafior Oct 17, 2017
ed9979e
Remove package-lock.json
mkalafior Oct 18, 2017
34ea947
Merge remote-tracking branch 'upstream/master'
mkalafior Nov 23, 2017
e28bc0f
Copy new Justpremium adapter from feature/1.0 branch
mkalafior Nov 23, 2017
16047de
#1881 Requested changes applied
mkalafior Nov 25, 2017
ec7a578
Merge remote-tracking branch 'upstream/master'
mkalafior Nov 29, 2017
291938e
#1892 Use `filter` instead `...new Set` to get unique values
mkalafior Nov 29, 2017
9de4f10
Merge remote-tracking branch 'upstream/master'
mkalafior Apr 3, 2018
8b0bd8c
Merge remote-tracking branch 'upstream/master'
mkalafior Apr 13, 2018
fa2fd0a
JSD-2248 update for adapter and tests
Apr 24, 2018
497e60b
JSD-2248 added transactionId in json array
Apr 24, 2018
829f7d3
JSD-2248 adapter changes
Apr 25, 2018
84c9627
JSD-2248 adapter changes
Apr 25, 2018
32d5064
Merge pull request #1 from mkalafior/feature/2.0
mkalafior May 1, 2018
ddad83b
Update docs
mkalafior May 1, 2018
0b069e0
Remove unnecessary return statement
mkalafior May 8, 2018
1a08a3c
Support for gdpr_consent in bid adapter
May 21, 2018
e470682
new cookie link and endpoint
May 21, 2018
fb8f017
back to old endpoint version
May 22, 2018
61109b7
sending version of prebid and adapter
May 22, 2018
9bd4d1a
sending version of prebid and adapter
May 22, 2018
a8c3e14
without version
May 23, 2018
cd81b65
Merge upstream
mkalafior May 23, 2018
0ed40ed
Merge branch 'master' into feature/gdpr
May 23, 2018
15804ce
Merge branch 'master' into feature/gdpr
nwlosinski May 23, 2018
c9f7c05
update for tests
May 23, 2018
10f1c95
changes for getUserSyncs method
May 23, 2018
85aa1f9
changes for getUserSyncs method
May 23, 2018
a1c2208
return gulpfile changes
May 23, 2018
12f96e2
Merge branch 'master' of https://github.com/prebid/Prebid.js
Jun 7, 2018
9786968
bugfix #2691
Jun 7, 2018
3e9c1ff
bugfix #2691
Jun 7, 2018
ecf2be0
changes in tests
Jun 7, 2018
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
3 changes: 2 additions & 1 deletion modules/justpremiumBidAdapter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@ export const spec = {
cpm: bid.price,
netRevenue: true,
currency: bid.currency || 'USD',
ttl: bid.ttl || spec.time
ttl: bid.ttl || spec.time,
format: bid.format
}
bidResponses.push(bidResponse)
}
Expand Down
4 changes: 3 additions & 1 deletion test/spec/modules/justpremiumBidAdapter_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ describe('justpremium adapter', () => {
cpm: 0.52,
netRevenue: true,
currency: 'USD',
ttl: 60000
ttl: 60000,
format: 'lb'
}
]

Expand All @@ -99,6 +100,7 @@ describe('justpremium adapter', () => {
expect(result[0].ttl).to.equal(60000)
expect(result[0].creativeId).to.equal(3213123)
expect(result[0].netRevenue).to.equal(true)
expect(result[0].format).to.equal('lb')
})

it('Verify wrong server response', () => {
Expand Down