Skip to content

Commit

Permalink
minor update
Browse files Browse the repository at this point in the history
  • Loading branch information
osulzhenko committed Mar 26, 2024
1 parent a306439 commit 4e09a34
Showing 1 changed file with 16 additions and 8 deletions.
24 changes: 16 additions & 8 deletions src/test/groovy/org/prebid/server/functional/tests/GeoSpec.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class GeoSpec extends BaseSpec {
def accountConfig = new AccountConfig(
auction: new AccountAuctionConfig(debugAllow: true),
settings: new AccountSetting(geoLookup: accountGeoLookup))
def account = new Account(status: ACTIVE, uuid: bidRequest.site.publisher.id, config: accountConfig)
def account = new Account(status: ACTIVE, uuid: bidRequest.accountId, config: accountConfig)
accountDao.save(account)

when: "PBS processes auction request"
Expand Down Expand Up @@ -90,6 +90,8 @@ class GeoSpec extends BaseSpec {
and: "Default bid request with device and geo data"
def bidRequest = BidRequest.defaultBidRequest.tap {
device = new Device(
ip: null,
ipv6: null,
geo: new Geo(
country: null,
region: null,
Expand All @@ -102,7 +104,7 @@ class GeoSpec extends BaseSpec {
def accountConfig = new AccountConfig(
auction: new AccountAuctionConfig(debugAllow: true),
settings: new AccountSetting(geoLookup: accountGeoLookup))
def account = new Account(status: ACTIVE, uuid: bidRequest.site.publisher.id, config: accountConfig)
def account = new Account(status: ACTIVE, uuid: bidRequest.accountId, config: accountConfig)
accountDao.save(account)

when: "PBS processes auction request"
Expand Down Expand Up @@ -152,7 +154,7 @@ class GeoSpec extends BaseSpec {
def accountConfig = new AccountConfig(
auction: new AccountAuctionConfig(debugAllow: true),
settings: new AccountSetting(geoLookup: accountGeoLookup))
def account = new Account(status: ACTIVE, uuid: bidRequest.site.publisher.id, config: accountConfig)
def account = new Account(status: ACTIVE, uuid: bidRequest.accountId, config: accountConfig)
accountDao.save(account)

when: "PBS processes auction request"
Expand Down Expand Up @@ -189,6 +191,8 @@ class GeoSpec extends BaseSpec {
and: "Default bid request with device and geo data"
def bidRequest = BidRequest.defaultBidRequest.tap {
device = new Device(
ip: null,
ipv6: null,
geo: new Geo(
country: null,
region: null,
Expand All @@ -201,7 +205,7 @@ class GeoSpec extends BaseSpec {
def accountConfig = new AccountConfig(
auction: new AccountAuctionConfig(debugAllow: true),
settings: new AccountSetting(geoLookup: accountGeoLookup))
def account = new Account(status: ACTIVE, uuid: bidRequest.site.publisher.id, config: accountConfig)
def account = new Account(status: ACTIVE, uuid: bidRequest.accountId, config: accountConfig)
accountDao.save(account)

when: "PBS processes auction request"
Expand Down Expand Up @@ -252,7 +256,7 @@ class GeoSpec extends BaseSpec {
def accountConfig = new AccountConfig(
auction: new AccountAuctionConfig(debugAllow: true),
settings: new AccountSetting(geoLookup: true))
def account = new Account(status: ACTIVE, uuid: bidRequest.site.publisher.id, config: accountConfig)
def account = new Account(status: ACTIVE, uuid: bidRequest.accountId, config: accountConfig)
accountDao.save(account)

when: "PBS processes auction request"
Expand Down Expand Up @@ -289,6 +293,8 @@ class GeoSpec extends BaseSpec {
and: "Default bid request with device and geo data"
def bidRequest = BidRequest.defaultBidRequest.tap {
device = new Device(
ip: null,
ipv6: null,
geo: new Geo(
country: null,
region: null,
Expand All @@ -301,7 +307,7 @@ class GeoSpec extends BaseSpec {
def accountConfig = new AccountConfig(
auction: new AccountAuctionConfig(debugAllow: true),
settings: new AccountSetting(geoLookup: true))
def account = new Account(status: ACTIVE, uuid: bidRequest.site.publisher.id, config: accountConfig)
def account = new Account(status: ACTIVE, uuid: bidRequest.accountId, config: accountConfig)
accountDao.save(account)

when: "PBS processes auction request"
Expand Down Expand Up @@ -348,7 +354,7 @@ class GeoSpec extends BaseSpec {
def accountConfig = new AccountConfig(
auction: new AccountAuctionConfig(debugAllow: true),
settings: new AccountSetting(geoLookup: true))
def account = new Account(status: ACTIVE, uuid: bidRequest.site.publisher.id, config: accountConfig)
def account = new Account(status: ACTIVE, uuid: bidRequest.accountId, config: accountConfig)
accountDao.save(account)

when: "PBS processes auction request"
Expand All @@ -374,6 +380,8 @@ class GeoSpec extends BaseSpec {
and: "Default bid request with device and geo data"
def bidRequest = BidRequest.defaultBidRequest.tap {
device = new Device(
ip: null,
ipv6: null,
geo: new Geo(
country: Country.CAN,
region: ONTARIO.abbreviation,
Expand All @@ -386,7 +394,7 @@ class GeoSpec extends BaseSpec {
def accountConfig = new AccountConfig(
auction: new AccountAuctionConfig(debugAllow: true),
settings: new AccountSetting(geoLookup: true))
def account = new Account(status: ACTIVE, uuid: bidRequest.site.publisher.id, config: accountConfig)
def account = new Account(status: ACTIVE, uuid: bidRequest.accountId, config: accountConfig)
accountDao.save(account)

when: "PBS processes auction request"
Expand Down

0 comments on commit 4e09a34

Please sign in to comment.