Skip to content

Commit

Permalink
Prebid 3.0 (#4580)
Browse files Browse the repository at this point in the history
* Remove pbs depracated legacy url (#4226)

* remove deprecated legacy url from pbs adapter

* fix eslint errors

* add and update tests for openRtb2 endpoint

* sync with master

* Revert "sync with master"

This reverts commit 8c2b196.

* removed targeting set filter and moved where render status is set to work with safeframe creatives (#4236)

* Depracate adloader loadscript fn (#4228)

* test commit

* add callback support to loadExternalScript()

* pass moduleCode for renderers

* test cases for loadExternalScript()

* store callbacks for cached url

* fully remove adloader()

* call callback() from stub

* remove and update function name

* getHighestCpmBids only returns non-rendered bids (#4247)

* Make all adapters https (#4294)

* update all adapters to https

* convert all adapters to https

* update unit tests

* remove files confilicting with other PR

* Removed pub common and unified id submodules as defaults in user id module (#4445)

* Deprecate user sync (#4241)

* deprecate some properties of userSync object

* change bid adapter to Appnexus

* fix 3 failing test cases

* make all unit test cases pass

* remove debugger

* deprecate support for adUnit.sizes for pubs (#4458)

* deprecate support for adUnit.sizes for pubs

* remove commented code

* Deprecations utils.js (#4249)

* deprecate domain/referer type functions

* delete modules that are using deprecated methods from utils.js

* remove reference to getTopWindowLocation

* sync with prebid-3.0 branch

* remove test suite for getTopWindowLocation

* add back md files of all deleted adapters

* add md files of deleted analytics adapters

* add adapters that are 3.0 compliant

* add back the rubicon skipped test

* remove min field from priceGranularity feature (#4574)
  • Loading branch information
jsnellbaker committed Dec 11, 2019
1 parent 81d8f36 commit 2cd8607
Show file tree
Hide file tree
Showing 360 changed files with 918 additions and 42,964 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ When you are adding code to Prebid.js, or modifying code that isn't covered by a
- _Assert_: check that the expected results have occurred
- e.g., use Chai assertions to check that the expected output is equal to the actual output
- Test the public interface, not the internal implementation
- If you need to check `adloader.loadScript` in a test, use a `stub` rather than a `spy`. `spy`s trigger a network call which can result in a `script error` and cause unrelated unit tests to fail. `stub`s will let you gather information about the `adloader.loadScript` call without affecting external resources
- If you need to check `adloader.loadExternalScript` in a test, use a `stub` rather than a `spy`. `spy`s trigger a network call which can result in a `script error` and cause unrelated unit tests to fail. `stub`s will let you gather information about the `adloader.loadExternalScript` call without affecting external resources
- When writing tests you may use ES2015 syntax if desired

### Test Examples
Expand Down
6 changes: 5 additions & 1 deletion integrationExamples/gpt/prebidServer_example.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,11 @@
pbjs.que.push(function() {
var adUnits = [{
code: 'div-gpt-ad-1460505748561-0',
sizes: [[300, 250]],
mediaTypes: {
banner: {
sizes: [[300, 250]]
}
},
bids: [
{
bidder: 'appnexus',
Expand Down
2 changes: 2 additions & 0 deletions modules/.submodules.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"userId": [
"unifiedIdSystem",
"pubCommonIdSystem",
"digiTrustIdSystem",
"id5IdSystem",
"criteortusIdSystem",
Expand Down
155 changes: 0 additions & 155 deletions modules/7xbidBidAdapter.js

This file was deleted.

89 changes: 0 additions & 89 deletions modules/a4gBidAdapter.js

This file was deleted.

4 changes: 2 additions & 2 deletions modules/aardvarkBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ export const spec = {
var req = requestsMap[auctionId];
requests.push({
method: 'GET',
url: `//${req.endpoint}/${auctionId}/${req.shortCodes.join('_')}/aardvark`,
url: `https://${req.endpoint}/${auctionId}/${req.shortCodes.join('_')}/aardvark`,
data: req.payload,
bidderRequest
});
Expand Down Expand Up @@ -162,7 +162,7 @@ export const spec = {

getUserSyncs: function(syncOptions, serverResponses, gdprConsent) {
const syncs = [];
var url = '//' + SYNC_ENDPOINT + '/cs';
var url = 'https://' + SYNC_ENDPOINT + '/cs';
var gdprApplies = false;
if (gdprConsent && (typeof gdprConsent.gdprApplies === 'boolean')) {
gdprApplies = gdprConsent.gdprApplies;
Expand Down
Loading

0 comments on commit 2cd8607

Please sign in to comment.