Merge pull request #244 from mattrubin/fix-screenshots

Fix screenshots

Author: mattrubin

Authenticator/Source/ProgressRingView.swift

@@ -84,6 +84,9 @@ class ProgressRingView: UIView {
         let animation = CABasicAnimation(keyPath: path)
         let now = layer.convertTime(CACurrentMediaTime(), from: nil)
         animation.beginTime = now + viewModel.startTime.timeIntervalSinceNow
+        if CommandLine.isDemo {
+            animation.beginTime -= DisplayTime.demoTime.date.timeIntervalSinceNow
+        }
         animation.duration = viewModel.duration
         animation.fromValue = 0
         animation.toValue = 1

AuthenticatorScreenshots/AuthenticatorScreenshots.swift

@@ -64,7 +64,7 @@ class AuthenticatorScreenshots: XCTestCase {
         // Take a screenshot of the token scanner.
         snapshot("1-ScanToken")
 
-        app.navigationBars.buttons["Compose"].tap()
+        app.navigationBars.buttons["Manual token entry"].tap()
         // Wait for the scroll bars to fade.
         sleep(1)
         // Take a screenshot of the token entry form.

Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (2.3.5)
+    CFPropertyList (2.3.6)
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
     babosa (1.0.2)
@@ -24,7 +24,7 @@ GEM
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
     fastimage (2.1.0)
-    fastlane (2.64.0)
+    fastlane (2.68.2)
       CFPropertyList (>= 2.3, < 3.0.0)
       addressable (>= 2.3, < 3.0.0)
       babosa (>= 1.0.2, < 2.0.0)
@@ -52,9 +52,9 @@ GEM
       slack-notifier (>= 1.3, < 2.0.0)
       terminal-notifier (>= 1.6.2, < 2.0.0)
       terminal-table (>= 1.4.5, < 2.0.0)
-      tty-screen (~> 0.5.0)
+      tty-screen (~> 0.6.2)
       word_wrap (~> 1.0.0)
-      xcodeproj (>= 1.5.0, < 2.0.0)
+      xcodeproj (>= 1.5.2, < 2.0.0)
       xcpretty (>= 0.2.4, < 1.0.0)
       xcpretty-travis-formatter (>= 0.0.3)
     gh_inspector (1.0.3)
@@ -65,15 +65,15 @@ GEM
       mime-types (~> 3.0)
       representable (~> 3.0)
       retriable (>= 2.0, < 4.0)
-    googleauth (0.6.1)
+    googleauth (0.6.2)
       faraday (~> 0.12)
       jwt (>= 1.4, < 3.0)
       logging (~> 2.0)
       memoist (~> 0.12)
       multi_json (~> 1.11)
       os (~> 0.9)
       signet (~> 0.7)
-    highline (1.7.8)
+    highline (1.7.10)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     httpclient (2.8.3)
@@ -93,7 +93,7 @@ GEM
     multipart-post (2.0.0)
     nanaimo (0.2.3)
     os (0.9.6)
-    plist (3.3.0)
+    plist (3.4.0)
     public_suffix (2.0.5)
     representable (3.0.4)
       declarative (< 0.1.0)
@@ -112,7 +112,7 @@ GEM
     terminal-notifier (1.8.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
-    tty-screen (0.5.1)
+    tty-screen (0.6.3)
     uber (0.1.0)
     unf (0.1.4)
       unf_ext