Skip to content

Commit

Permalink
Merge branch 'master' into fix-gpc
Browse files Browse the repository at this point in the history
  • Loading branch information
@scr-oath
scr-oath authored Dec 13, 2024
2 parents 8444c5c + 35e389f commit 8f05e81
Show file tree
Hide file tree
Showing 70 changed files with 2,706 additions and 262 deletions.
2 changes: 1 addition & 1 deletion adapters/adnuntius/adnuntius.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ func makeEndpointUrl(ortbRequest openrtb2.BidRequest, a *adapter, noCookies bool
}

q.Set("tzo", fmt.Sprint(tzo))
q.Set("format", "prebid")
q.Set("format", "prebidServer")

url := endpointUrl + "?" + q.Encode()
return url, nil
Expand Down
2 changes: 1 addition & 1 deletion adapters/adnuntius/adnuntiustest/exemplary/simple-banner.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"httpCalls": [
{
"expectedRequest": {
"uri": "http://whatever.url?format=prebid&tzo=0",
"uri": "http://whatever.url?format=prebidServer&tzo=0",
"body": {
"adUnits": [
{
Expand Down
2 changes: 1 addition & 1 deletion adapters/adnuntius/adnuntiustest/supplemental/check-dealId.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"httpCalls": [
{
"expectedRequest": {
"uri": "http://whatever.url?format=prebid&tzo=0",
"uri": "http://whatever.url?format=prebidServer&tzo=0",
"body": {
"adUnits": [
{
Expand Down
2 changes: 1 addition & 1 deletion adapters/adnuntius/adnuntiustest/supplemental/check-dsa-advertiser-legalName-omitted.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"httpCalls": [
{
"expectedRequest": {
"uri": "http://whatever.url?format=prebid&tzo=0",
"uri": "http://whatever.url?format=prebidServer&tzo=0",
"body": {
"adUnits": [
{
Expand Down
2 changes: 1 addition & 1 deletion adapters/adnuntius/adnuntiustest/supplemental/check-dsa-advertiser-legalName.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"httpCalls": [
{
"expectedRequest": {
"uri": "http://whatever.url?format=prebid&tzo=0",
"uri": "http://whatever.url?format=prebidServer&tzo=0",
"body": {
"adUnits": [
{
Expand Down
2 changes: 1 addition & 1 deletion adapters/adnuntius/adnuntiustest/supplemental/check-dsa-advertiser-omitted.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"httpCalls": [
{
"expectedRequest": {
"uri": "http://whatever.url?format=prebid&tzo=0",
"uri": "http://whatever.url?format=prebidServer&tzo=0",
"body": {
"adUnits": [
{
Expand Down
2 changes: 1 addition & 1 deletion adapters/adnuntius/adnuntiustest/supplemental/check-gdpr.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"httpCalls": [
{
"expectedRequest": {
"uri": "http://gdpr.url?consentString=CONSENT_STRING&format=prebid&gdpr=1&tzo=0",
"uri": "http://gdpr.url?consentString=CONSENT_STRING&format=prebidServer&gdpr=1&tzo=0",
"body": {
"adUnits": [
{
Expand Down
2 changes: 1 addition & 1 deletion adapters/adnuntius/adnuntiustest/supplemental/check-gross-bids.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"httpCalls": [
{
"expectedRequest": {
"uri": "http://whatever.url?format=prebid&tzo=0",
"uri": "http://whatever.url?format=prebidServer&tzo=0",
"body": {
"adUnits": [
{
Expand Down
2 changes: 1 addition & 1 deletion adapters/adnuntius/adnuntiustest/supplemental/check-net-bids.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"httpCalls": [
{
"expectedRequest": {
"uri": "http://whatever.url?format=prebid&tzo=0",
"uri": "http://whatever.url?format=prebidServer&tzo=0",
"body": {
"adUnits": [
{
Expand Down
2 changes: 1 addition & 1 deletion adapters/adnuntius/adnuntiustest/supplemental/check-noCookies-parameter.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"httpCalls": [
{
"expectedRequest": {
"uri": "http://whatever.url?format=prebid&noCookies=true&tzo=0",
"uri": "http://whatever.url?format=prebidServer&noCookies=true&tzo=0",
"body": {
"adUnits": [
{
Expand Down
2 changes: 1 addition & 1 deletion adapters/adnuntius/adnuntiustest/supplemental/check-noCookies.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"httpCalls": [
{
"expectedRequest": {
"uri": "http://whatever.url?format=prebid&noCookies=true&tzo=0",
"uri": "http://whatever.url?format=prebidServer&noCookies=true&tzo=0",
"body": {
"adUnits": [
{
Expand Down
2 changes: 1 addition & 1 deletion adapters/adnuntius/adnuntiustest/supplemental/check-order-multi-imp.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"httpCalls": [
{
"expectedRequest": {
"uri": "http://whatever.url?format=prebid&tzo=0",
"uri": "http://whatever.url?format=prebidServer&tzo=0",
"body": {
"adUnits": [
{
Expand Down
2 changes: 1 addition & 1 deletion adapters/adnuntius/adnuntiustest/supplemental/check-userId.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"httpCalls": [
{
"expectedRequest": {
"uri": "http://whatever.url?format=prebid&tzo=0",
"uri": "http://whatever.url?format=prebidServer&tzo=0",
"body": {
"adUnits": [
{
Expand Down
2 changes: 1 addition & 1 deletion adapters/adnuntius/adnuntiustest/supplemental/empty-regs-ext.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"httpCalls": [
{
"expectedRequest": {
"uri": "http://whatever.url?format=prebid&tzo=0",
"uri": "http://whatever.url?format=prebidServer&tzo=0",
"body": {
"adUnits": [
{
Expand Down
2 changes: 1 addition & 1 deletion adapters/adnuntius/adnuntiustest/supplemental/empty-regs.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"httpCalls": [
{
"expectedRequest": {
"uri": "http://whatever.url?format=prebid&tzo=0",
"uri": "http://whatever.url?format=prebidServer&tzo=0",
"body": {
"adUnits": [
{
Expand Down
2 changes: 1 addition & 1 deletion adapters/adnuntius/adnuntiustest/supplemental/height-error.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"httpCalls": [
{
"expectedRequest": {
"uri": "http://whatever.url?format=prebid&tzo=0",
"uri": "http://whatever.url?format=prebidServer&tzo=0",
"body": {
"adUnits": [
{
Expand Down
2 changes: 1 addition & 1 deletion adapters/adnuntius/adnuntiustest/supplemental/max-deals-test.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"httpCalls": [
{
"expectedRequest": {
"uri": "http://whatever.url?format=prebid&tzo=0",
"uri": "http://whatever.url?format=prebidServer&tzo=0",
"body": {
"adUnits": [
{
Expand Down
2 changes: 1 addition & 1 deletion adapters/adnuntius/adnuntiustest/supplemental/send-header-information.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"Mozilla/5.0 (Linux; Android 8.0; Pixel 2 Build/OPD3.170816.012) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.93 Mobile Safari/537.36"
]
},
"uri": "http://whatever.url?format=prebid&tzo=0",
"uri": "http://whatever.url?format=prebidServer&tzo=0",
"body": {
"adUnits": [
{
Expand Down
2 changes: 1 addition & 1 deletion adapters/adnuntius/adnuntiustest/supplemental/site-ext.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"httpCalls": [
{
"expectedRequest": {
"uri": "http://whatever.url?format=prebid&tzo=0",
"uri": "http://whatever.url?format=prebidServer&tzo=0",
"body": {
"adUnits": [
{
Expand Down
2 changes: 1 addition & 1 deletion adapters/adnuntius/adnuntiustest/supplemental/size-check.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"httpCalls": [
{
"expectedRequest": {
"uri": "http://whatever.url?format=prebid&noCookies=true&tzo=0",
"uri": "http://whatever.url?format=prebidServer&noCookies=true&tzo=0",
"body": {
"adUnits": [
{
Expand Down
2 changes: 1 addition & 1 deletion adapters/adnuntius/adnuntiustest/supplemental/status-400.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"httpCalls": [
{
"expectedRequest": {
"uri": "http://whatever.url?format=prebid&tzo=0",
"uri": "http://whatever.url?format=prebidServer&tzo=0",
"body": {
"adUnits": [
{
Expand Down
2 changes: 1 addition & 1 deletion adapters/adnuntius/adnuntiustest/supplemental/test-networks.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"httpCalls": [
{
"expectedRequest": {
"uri": "http://whatever.url?format=prebid&tzo=0",
"uri": "http://whatever.url?format=prebidServer&tzo=0",
"body": {
"adUnits": [
{
Expand Down
2 changes: 1 addition & 1 deletion adapters/adnuntius/adnuntiustest/supplemental/user-ext.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"httpCalls": [
{
"expectedRequest": {
"uri": "http://whatever.url?format=prebid&tzo=0",
"uri": "http://whatever.url?format=prebidServer&tzo=0",
"body": {
"adUnits": [
{
Expand Down
2 changes: 1 addition & 1 deletion adapters/adnuntius/adnuntiustest/supplemental/width-error.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"httpCalls": [
{
"expectedRequest": {
"uri": "http://whatever.url?format=prebid&tzo=0",
"uri": "http://whatever.url?format=prebidServer&tzo=0",
"body": {
"adUnits": [
{
Expand Down
Loading

0 comments on commit 8f05e81

Please sign in to comment.