diff options
| author | Jason Wray <friedbunny@users.noreply.github.com> | 2019-09-09 10:26:01 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-09 10:26:01 -0700 |
| commit | 8ccf15069dc4b22d19939f0bc85a69204d6d0e09 (patch) | |
| tree | 46beb957cd74da7b46a2231042e2eb27d7d84762 /platform/ios | |
| parent | b041488c20588ec03678d4a4cc32515cc40a4047 (diff) | |
| download | qtlocation-mapboxgl-8ccf15069dc4b22d19939f0bc85a69204d6d0e09.tar.gz | |
[darwin] Use en_US as default test locale/language
Diffstat (limited to 'platform/ios')
3 files changed, 14 insertions, 19 deletions
diff --git a/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/CI.xcscheme b/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/CI.xcscheme index 7d59c4edee..ebe96ef82d 100644 --- a/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/CI.xcscheme +++ b/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/CI.xcscheme @@ -54,6 +54,8 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + language = "en" + region = "US" codeCoverageEnabled = "YES" onlyGenerateCoverageForSpecifiedTargets = "YES" shouldUseLaunchSchemeArgsEnv = "NO"> diff --git a/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/dynamic.xcscheme b/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/dynamic.xcscheme index 65d4b059e8..4fdd896401 100644 --- a/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/dynamic.xcscheme +++ b/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/dynamic.xcscheme @@ -40,7 +40,18 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - shouldUseLaunchSchemeArgsEnv = "YES"> + shouldUseLaunchSchemeArgsEnv = "YES" + language = "en" + region = "US"> + <MacroExpansion> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "DA8847D11CBAF91600AB86E3" + BuildableName = "Mapbox.framework" + BlueprintName = "dynamic" + ReferencedContainer = "container:ios.xcodeproj"> + </BuildableReference> + </MacroExpansion> <Testables> <TestableReference skipped = "NO" @@ -54,17 +65,6 @@ </BuildableReference> </TestableReference> </Testables> - <MacroExpansion> - <BuildableReference - BuildableIdentifier = "primary" - BlueprintIdentifier = "DA8847D11CBAF91600AB86E3" - BuildableName = "Mapbox.framework" - BlueprintName = "dynamic" - ReferencedContainer = "container:ios.xcodeproj"> - </BuildableReference> - </MacroExpansion> - <AdditionalOptions> - </AdditionalOptions> </TestAction> <LaunchAction buildConfiguration = "Debug" @@ -85,8 +85,6 @@ ReferencedContainer = "container:ios.xcodeproj"> </BuildableReference> </MacroExpansion> - <AdditionalOptions> - </AdditionalOptions> </LaunchAction> <ProfileAction buildConfiguration = "Release" diff --git a/platform/ios/test/MGLMapAccessibilityElementTests.m b/platform/ios/test/MGLMapAccessibilityElementTests.m index 2312d1d406..916461e708 100644 --- a/platform/ios/test/MGLMapAccessibilityElementTests.m +++ b/platform/ios/test/MGLMapAccessibilityElementTests.m @@ -8,11 +8,6 @@ @implementation MGLMapAccessibilityElementTests -- (void)setUp { - // FIXME: https://github.com/mapbox/mapbox-gl-native/issues/14908 - XCTAssertEqualObjects(NSLocale.currentLocale.localeIdentifier, @"en_US", @"Device locale must be en_US for these tests to pass."); -} - - (void)testFeatureLabels { MGLPointFeature *feature = [[MGLPointFeature alloc] init]; feature.attributes = @{ |