From 53466386fd20e82d04f6657bc063415295f0ffee Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Mon, 15 Oct 2018 12:59:28 -0400
Subject: [PATCH] Get tests running.

---
 Signal/test/Models/AccountManagerTest.swift | 4 ++++
 Signal/test/SignalBaseTest.m                | 2 +-
 SignalServiceKit/src/Util/AppReadiness.m    | 7 +++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/Signal/test/Models/AccountManagerTest.swift b/Signal/test/Models/AccountManagerTest.swift
index 550a1d60c..3293f7a7b 100644
--- a/Signal/test/Models/AccountManagerTest.swift
+++ b/Signal/test/Models/AccountManagerTest.swift
@@ -48,6 +48,10 @@ class VerifyingTSAccountManager: FailingTSAccountManager {
         success()
     }
 
+    // TODO:
+//    override func updateAcountAttributes() -> Promise<Void> {
+//        return Promise(value: ())
+//    }
 }
 
 class TokenObtainingTSAccountManager: VerifyingTSAccountManager {
diff --git a/Signal/test/SignalBaseTest.m b/Signal/test/SignalBaseTest.m
index 5af79232f..d07e8ab9c 100644
--- a/Signal/test/SignalBaseTest.m
+++ b/Signal/test/SignalBaseTest.m
@@ -23,8 +23,8 @@ NS_ASSUME_NONNULL_BEGIN
 
     SetCurrentAppContext([TestAppContext new]);
 
-    [MockEnvironment activate];
     [MockSSKEnvironment activate];
+    [MockEnvironment activate];
 }
 
 - (void)tearDown
diff --git a/SignalServiceKit/src/Util/AppReadiness.m b/SignalServiceKit/src/Util/AppReadiness.m
index 33b799179..f8ec61506 100755
--- a/SignalServiceKit/src/Util/AppReadiness.m
+++ b/SignalServiceKit/src/Util/AppReadiness.m
@@ -61,6 +61,12 @@ NS_ASSUME_NONNULL_BEGIN
     OWSAssertIsOnMainThread();
     OWSAssertDebug(block);
 
+    if (CurrentAppContext().isRunningTests) {
+        // We don't need to an any "on app ready" work
+        // in the tests.
+        return;
+    }
+
     if (self.isAppReady) {
         block();
         return;
@@ -93,6 +99,7 @@ NS_ASSUME_NONNULL_BEGIN
 
     NSArray<AppReadyBlock> *appReadyBlocks = [self.appReadyBlocks copy];
     [self.appReadyBlocks removeAllObjects];
+
     for (AppReadyBlock block in appReadyBlocks) {
         block();
     }