diff --git a/deliver/lib/deliver/app_screenshot.rb b/deliver/lib/deliver/app_screenshot.rb index 15d89cfbf4f..679886b8875 100644 --- a/deliver/lib/deliver/app_screenshot.rb +++ b/deliver/lib/deliver/app_screenshot.rb @@ -69,6 +69,8 @@ module ScreenSize IOS_APPLE_WATCH_SERIES4 = "iOS-Apple-Watch-Series4" # Apple Watch Series 7 IOS_APPLE_WATCH_SERIES7 = "iOS-Apple-Watch-Series7" + # Apple Watch Ultra + IOS_APPLE_WATCH_ULTRA = "iOS-Apple-Watch-Ultra" # Apple TV APPLE_TV = "Apple-TV" @@ -128,6 +130,7 @@ def device_type ScreenSize::IOS_APPLE_WATCH => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::APP_WATCH_SERIES_3, ScreenSize::IOS_APPLE_WATCH_SERIES4 => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::APP_WATCH_SERIES_4, ScreenSize::IOS_APPLE_WATCH_SERIES7 => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::APP_WATCH_SERIES_7, + ScreenSize::IOS_APPLE_WATCH_ULTRA => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::APP_WATCH_ULTRA, ScreenSize::APPLE_TV => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::APP_APPLE_TV } return matching[self.screen_size] @@ -165,6 +168,7 @@ def formatted_name ScreenSize::IOS_APPLE_WATCH => "Watch", ScreenSize::IOS_APPLE_WATCH_SERIES4 => "Watch Series4", ScreenSize::IOS_APPLE_WATCH_SERIES7 => "Watch Series7", + ScreenSize::IOS_APPLE_WATCH_ULTRA => "Watch Ultra", ScreenSize::APPLE_TV => "Apple TV" } return matching[self.screen_size] @@ -340,6 +344,9 @@ def self.devices ScreenSize::IOS_APPLE_WATCH_SERIES7 => [ [396, 484] ], + ScreenSize::IOS_APPLE_WATCH_ULTRA => [ + [410, 502] + ], ScreenSize::APPLE_TV => [ [1920, 1080], [3840, 2160] diff --git a/deliver/spec/app_screenshot_spec.rb b/deliver/spec/app_screenshot_spec.rb index a93eb5d19e6..55b140adc89 100644 --- a/deliver/spec/app_screenshot_spec.rb +++ b/deliver/spec/app_screenshot_spec.rb @@ -154,6 +154,7 @@ def expect_screen_size_from_file(file) expect_screen_size_from_file("AppleWatch-Series3{312x390}.jpg").to eq(ScreenSize::IOS_APPLE_WATCH) expect_screen_size_from_file("AppleWatch-Series4{368x448}.jpg").to eq(ScreenSize::IOS_APPLE_WATCH_SERIES4) expect_screen_size_from_file("AppleWatch-Series7{396x484}.jpg").to eq(ScreenSize::IOS_APPLE_WATCH_SERIES7) + expect_screen_size_from_file("AppleWatch-Ultra{410x502}.jpg").to eq(ScreenSize::IOS_APPLE_WATCH_ULTRA) end end @@ -371,6 +372,10 @@ def app_screenshot_with(screen_size, path = '', language = 'en-US') expect(app_screenshot_with(ScreenSize::IOS_APPLE_WATCH_SERIES7).device_type).to eq("APP_WATCH_SERIES_7") end + it "should return watchUltra for Apple Watch Ultra" do + expect(app_screenshot_with(ScreenSize::IOS_APPLE_WATCH_ULTRA).device_type).to eq("APP_WATCH_ULTRA") + end + it "should return appleTV for Apple TV" do expect(app_screenshot_with(ScreenSize::APPLE_TV).device_type).to eq("APP_APPLE_TV") end diff --git a/spaceship/lib/spaceship/connect_api/models/app_screenshot_set.rb b/spaceship/lib/spaceship/connect_api/models/app_screenshot_set.rb index 89c142b032f..54746a75c4f 100644 --- a/spaceship/lib/spaceship/connect_api/models/app_screenshot_set.rb +++ b/spaceship/lib/spaceship/connect_api/models/app_screenshot_set.rb @@ -43,6 +43,7 @@ module DisplayType APP_WATCH_SERIES_3 = "APP_WATCH_SERIES_3" APP_WATCH_SERIES_4 = "APP_WATCH_SERIES_4" APP_WATCH_SERIES_7 = "APP_WATCH_SERIES_7" + APP_WATCH_ULTRA = "APP_WATCH_ULTRA" APP_APPLE_TV = "APP_APPLE_TV" @@ -97,6 +98,7 @@ module DisplayType APP_WATCH_SERIES_3, APP_WATCH_SERIES_4, APP_WATCH_SERIES_7, + APP_WATCH_ULTRA, APP_DESKTOP ]