1 files changed, 36 insertions, 21 deletions

diff --git a/platform/ios/Integration Tests/MGLMapViewIntegrationTest.m b/platform/ios/Integration Tests/MGLMapViewIntegrationTest.m
index 1538c09516..33b8e414cb 100644
--- a/platform/ios/Integration Tests/MGLMapViewIntegrationTest.m
+++ b/platform/ios/Integration Tests/MGLMapViewIntegrationTest.m
@@ -7,30 +7,43 @@
 
 @implementation MGLMapViewIntegrationTest
 
-- (void)invokeTest {
-    NSString *selector = NSStringFromSelector(self.invocation.selector);
-    BOOL isPendingTest = [selector hasSuffix:@"PENDING"];
++ (XCTestSuite*)defaultTestSuite {
     
-    if (isPendingTest) {
-        NSString *runPendingTests = [[NSProcessInfo processInfo] environment][@"MAPBOX_RUN_PENDING_TESTS"];
-        if (![runPendingTests boolValue]) {
-            printf("warning: '%s' is a pending test - skipping\n", selector.UTF8String);
-            return;
+    XCTestSuite *defaultTestSuite = [super defaultTestSuite];
+    
+    NSArray *tests = defaultTestSuite.tests;
+ 
+    XCTestSuite *newTestSuite = [XCTestSuite testSuiteWithName:defaultTestSuite.name];
+    
+    BOOL runPendingTests = [[[NSProcessInfo processInfo] environment][@"MAPBOX_RUN_PENDING_TESTS"] boolValue];
+    NSString *accessToken = [[NSProcessInfo processInfo] environment][@"MAPBOX_ACCESS_TOKEN"];
+        
+    for (XCTest *test in tests) {
+        
+        // Check for pending tests
+        if ([test.name containsString:@"PENDING"] ||
+            [test.name containsString:@"🙁"]) {
+            if (!runPendingTests) {
+                printf("warning: '%s' is a pending test - skipping\n", test.name.UTF8String);
+                continue;
+            }
+        }
+        
+        // Check for tests that require a valid access token
+        if ([test.name containsString:@"🔒"]) {
+            if (accessToken) {
+                ((MGLMapViewIntegrationTest *)test).accessToken = accessToken;
+            }
+            else {
+                printf("warning: MAPBOX_ACCESS_TOKEN env var is required for test '%s' - skipping.\n", test.name.UTF8String);
+                continue;
+            }
         }
-    }
-
-    [super invokeTest];
-}
 
-- (NSString*)validAccessToken {
-    NSString *accessToken = [[NSProcessInfo processInfo] environment][@"MAPBOX_ACCESS_TOKEN"];
-    if (!accessToken) {
-        printf("warning: MAPBOX_ACCESS_TOKEN env var is required for this test - skipping.\n");
-        return nil;
+        [newTestSuite addTest:test];
     }
-
-    [MGLAccountManager setAccessToken:accessToken];
-    return accessToken;
+    
+    return newTestSuite;
 }
 
 - (MGLMapView *)mapViewForTestWithFrame:(CGRect)rect styleURL:(NSURL *)styleURL {
@@ -40,7 +53,8 @@
 - (void)setUp {
     [super setUp];
 
-    [MGLAccountManager setAccessToken:@"pk.feedcafedeadbeefbadebede"];
+    [MGLAccountManager setAccessToken:self.accessToken ?: @"pk.feedcafedeadbeefbadebede"];
+    
     NSURL *styleURL = [[NSBundle bundleForClass:[self class]] URLForResource:@"one-liner" withExtension:@"json"];
 
     self.mapView = [self mapViewForTestWithFrame:UIScreen.mainScreen.bounds styleURL:styleURL];
@@ -135,6 +149,7 @@
     XCTAssertNil(self.styleLoadingExpectation);
     self.styleLoadingExpectation = [self expectationWithDescription:@"Map view should finish loading style."];
     [self waitForExpectations:@[self.styleLoadingExpectation] timeout:timeout];
+    self.styleLoadingExpectation = nil;
 }
 
 - (void)waitForMapViewToBeRenderedWithTimeout:(NSTimeInterval)timeout {