From b5331ef2d66d35d66b468a05ec9162122f89ea7e Mon Sep 17 00:00:00 2001 From: shum Date: Thu, 29 Oct 2026 07:54:15 +0000 Subject: [PATCH] store: use badges_static_dir in #7716's tests --- tests/Bots/StoreService/BotTests.hs | 8 ++++---- tests/Bots/StoreService/StoreVerifierTests.hs | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/Bots/StoreService/BotTests.hs b/tests/Bots/StoreService/BotTests.hs index 54b47cda69..6480eb31f5 100644 --- a/tests/Bots/StoreService/BotTests.hs +++ b/tests/Bots/StoreService/BotTests.hs @@ -2433,7 +2433,7 @@ walkPlayMonthEnd :: HasCallStack => TestParams -> Text -> Integer -> Int -> IO ( walkPlayMonthEnd ps planId planMonths months = withFakePlay $ \fake@FakePlay {fpConfig} -> do let ini = takeDirectory (gServiceAccountFile fpConfig) "store_service.ini" - writeFile ini "[listener]\nstatic_dir = /srv/badges\n" + writeFile ini "[listener]\nbadges_static_dir = /srv/badges\n" Right cfg <- readServiceConfig ini ServiceState {storeVerifier} <- newServiceState >>= configureStoreVerifier (Just cfg {playStore = Just fpConfig}) withStoreServiceVerifier ps (const storeVerifier) $ \env@StoreServiceEnv {bsClock, bsController = cc} -> do @@ -5192,7 +5192,7 @@ testAppleSubscriptionWithoutApiKey ps = do createDirectoryIfMissing True "tests/tmp" withTempDirectory "tests/tmp" "apple-no-api-key" $ \d -> do B.writeFile (d "root.cer") (encodeSignedObject $ rootCert chain) - writeFile (d "store_service.ini") "[listener]\nstatic_dir = /srv/badges\n" + writeFile (d "store_service.ini") "[listener]\nbadges_static_dir = /srv/badges\n" Right cfg <- readServiceConfig (d "store_service.ini") let apple = AppleStoreConfig {aBundleId = ourBundleId, aRootCertificates = (d "root.cer") :| [], aServerApi = Nothing} ServiceState {storeVerifier} <- newServiceState >>= configureStoreVerifier (Just cfg {appleStore = Just apple}) @@ -5249,7 +5249,7 @@ testPlaySubscriptionThroughPlay :: HasCallStack => TestParams -> IO () testPlaySubscriptionThroughPlay ps = withFakePlay $ \fake@FakePlay {fpConfig} -> do let ini = takeDirectory (gServiceAccountFile fpConfig) "store_service.ini" - writeFile ini "[listener]\nstatic_dir = /srv/badges\n" + writeFile ini "[listener]\nbadges_static_dir = /srv/badges\n" Right cfg <- readServiceConfig ini ServiceState {storeVerifier = withoutPlay} <- newServiceState >>= configureStoreVerifier (Just cfg) ServiceState {storeVerifier} <- newServiceState >>= configureStoreVerifier (Just cfg {playStore = Just fpConfig}) @@ -5914,7 +5914,7 @@ testStoreChecksConfigured :: HasCallStack => TestParams -> IO () testStoreChecksConfigured _ = do createDirectoryIfMissing True "tests/tmp" withTempDirectory "tests/tmp" "store-checks" $ \d -> do - writeFile (d "store_service.ini") "[listener]\nstatic_dir = /srv/badges\n" + writeFile (d "store_service.ini") "[listener]\nbadges_static_dir = /srv/badges\n" Right cfg <- readServiceConfig (d "store_service.ini") let checksFor c = (\ServiceState {storeVerifier} -> storeChecks storeVerifier) <$> (newServiceState >>= configureStoreVerifier c) creditsFor c = (\ServiceState {storeVerifier} -> creditTestPurchases storeVerifier) <$> (newServiceState >>= configureStoreVerifier c) diff --git a/tests/Bots/StoreService/StoreVerifierTests.hs b/tests/Bots/StoreService/StoreVerifierTests.hs index ca23771a72..898986af73 100644 --- a/tests/Bots/StoreService/StoreVerifierTests.hs +++ b/tests/Bots/StoreService/StoreVerifierTests.hs @@ -649,7 +649,7 @@ testAppleConfiguredSubscriptions = do ini = dir "store_service.ini" apple serverApi = Just AppleStoreConfig {aBundleId = ourBundleId, aRootCertificates = rootFile :| [], aServerApi = serverApi} B.writeFile rootFile (encodeSignedObject $ rootCert chain) - writeFile ini "[listener]\nstatic_dir = /srv/badges\n" + writeFile ini "[listener]\nbadges_static_dir = /srv/badges\n" Right cfg <- readServiceConfig ini ServiceState {storeVerifier = withKey} <- newServiceState >>= configureStoreVerifier (Just cfg {appleStore = apple (Just fasApi)}) ServiceState {storeVerifier = withoutKey} <- newServiceState >>= configureStoreVerifier (Just cfg {appleStore = apple Nothing}) @@ -1077,7 +1077,7 @@ testPlayConfiguredSubscriptions = do outcomes v = (,) <$> (outcome <$> checkStoreSubscription v (SubscriptionGoogle subscriptionToken) Nothing) <*> (outcome <$> checkStoreSubscription v (SubscriptionApple subscriptionId) Nothing) acknowledging v = subscriptionAcknowledgement v SPGoogle {productId = subscriptionProductId, token = subscriptionToken} B.writeFile rootFile (encodeSignedObject $ rootCert chain) - writeFile ini "[listener]\nstatic_dir = /srv/badges\n" + writeFile ini "[listener]\nbadges_static_dir = /srv/badges\n" Right cfg <- readServiceConfig ini both <- configured cfg {appleStore = apple, playStore = Just fpConfig} playOnly <- configured cfg {playStore = Just fpConfig}