From dfd6ff00a239ef7c4762346edf798aa5dfb7bf3f Mon Sep 17 00:00:00 2001
From: Jason Wray <jason@kulturny.com>
Date: Thu, 21 May 2015 03:13:55 -0700
Subject: Update tests for access token changes

---
 test/ios/App-Info.plist       | 4 ++++
 test/ios/MGLTAppDelegate.m    | 2 --
 test/ios/MGLTViewController.m | 3 +--
 test/ios/MetricsTests.m       | 6 ------
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/test/ios/App-Info.plist b/test/ios/App-Info.plist
index d7e9d5c462..effff2063e 100644
--- a/test/ios/App-Info.plist
+++ b/test/ios/App-Info.plist
@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>MGLMapboxAccessToken</key>
+	<string>pk.eyJ1IjoianVzdGluIiwiYSI6Ik9RX3RRQzAifQ.dmOg_BAp1ywuDZMM7YsXRg</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>
@@ -34,6 +36,8 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+	<key>MGLMapboxMetricsEnabledSettingShownInApp</key>
+	<true/>
 	<key>UISupportedInterfaceOrientations~ipad</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
diff --git a/test/ios/MGLTAppDelegate.m b/test/ios/MGLTAppDelegate.m
index bbd67821fe..3fa68b6da1 100644
--- a/test/ios/MGLTAppDelegate.m
+++ b/test/ios/MGLTAppDelegate.m
@@ -13,8 +13,6 @@
     wrapper.toolbarHidden = YES;
     [self.window makeKeyAndVisible];
 
-    [MGLAccountManager setMapboxMetricsEnabledSettingShownInApp:YES]; // a lie, but a convenient one
-
     return YES;
 }
 
diff --git a/test/ios/MGLTViewController.m b/test/ios/MGLTViewController.m
index bdce2202d7..e3357616f8 100644
--- a/test/ios/MGLTViewController.m
+++ b/test/ios/MGLTViewController.m
@@ -10,8 +10,7 @@
 {
     [super viewDidLoad];
 
-    _mapView = [[MGLMapView alloc] initWithFrame:self.view.bounds
-                                                accessToken:@"pk.eyJ1IjoianVzdGluIiwiYSI6Ik9RX3RRQzAifQ.dmOg_BAp1ywuDZMM7YsXRg"];
+    _mapView = [[MGLMapView alloc] initWithFrame:self.view.bounds];
     _mapView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
 
     [self.view addSubview:_mapView];
diff --git a/test/ios/MetricsTests.m b/test/ios/MetricsTests.m
index 5b1a7956ea..758cf1f5be 100644
--- a/test/ios/MetricsTests.m
+++ b/test/ios/MetricsTests.m
@@ -60,12 +60,6 @@
     XCTAssertEqualObjects([[MGLMapboxEvents sharedManager] appBundleId], @"com.mapbox.Mapbox-GL-Tests");
 }
 
-- (void)testTokenSetViaMapView {
-    [tester.mapView setAccessToken:@"test_token"];
-
-    XCTAssertEqualObjects([[MGLMapboxEvents sharedManager] token], @"test_token");
-}
-
 - (void)testResumeMetricsCollection {
     [MGLMapboxEvents resumeMetricsCollection];
 
-- 
cgit v1.2.1