Update screenshots

Author: chrisballinger

ChatSecure.xcodeproj/project.pbxproj

@@ -625,7 +625,7 @@
 		6308D1441CA20762002F5F30 /* Pods-ChatSecureCorePods-ChatSecure-acknowledgements.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Pods-ChatSecureCorePods-ChatSecure-acknowledgements.plist"; path = "Pods/Target Support Files/Pods-ChatSecureCorePods-ChatSecure/Pods-ChatSecureCorePods-ChatSecure-acknowledgements.plist"; sourceTree = "<group>"; };
 		6309E4D51D493B6E002CF8FC /* OTRAccountSignalEncryptionManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OTRAccountSignalEncryptionManager.swift; sourceTree = "<group>"; };
 		631C79921E56846700B30CB4 /* NSData+ChatSecure.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSData+ChatSecure.swift"; sourceTree = "<group>"; };
-		632157DC1E57D01A00738D4E /* SnapshotHelper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SnapshotHelper.swift; path = snapshot/SnapshotHelper.swift; sourceTree = SOURCE_ROOT; };
+		632157DC1E57D01A00738D4E /* SnapshotHelper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SnapshotHelper.swift; path = fastlane/SnapshotHelper.swift; sourceTree = SOURCE_ROOT; };
 		63232AC61E37F13C00D84CDF /* OTRAccountDatabaseCount.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OTRAccountDatabaseCount.swift; sourceTree = "<group>"; };
 		6323C6FD1E39547200D0FB42 /* OTRImageTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OTRImageTest.swift; sourceTree = "<group>"; };
 		6323C7001E396D3D00D0FB42 /* landscape.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = landscape.jpg; path = TestImages/landscape.jpg; sourceTree = "<group>"; };

ChatSecure.xcodeproj/xcshareddata/xcschemes/ChatSecure.xcscheme

@@ -40,6 +40,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      disableMainThreadChecker = "YES"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -52,16 +53,6 @@
                ReferencedContainer = "container:ChatSecure.xcodeproj">
             </BuildableReference>
          </TestableReference>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "D9227C321BA7952100B5E1D0"
-               BuildableName = "ChatSecureCoreTests.xctest"
-               BlueprintName = "ChatSecureCoreTests"
-               ReferencedContainer = "container:ChatSecure.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
          <TestableReference
             skipped = "NO">
             <BuildableReference

ChatSecure.xcodeproj/xcshareddata/xcschemes/ChatSecureUITests.xcscheme

@@ -10,6 +10,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      disableMainThreadChecker = "YES"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -39,6 +40,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      disableMainThreadChecker = "YES"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

ChatSecureUITests/ChatSecureUITests.swift

@@ -34,6 +34,13 @@ func skipEnablePush(_ app:XCUIApplication) {
     }
 }
 
+func skipDonatePrompt(_ app:XCUIApplication) {
+    let maybeLater = app.buttons[localizedString("Maybe Later")]
+    if (maybeLater.exists) {
+        maybeLater.tap()
+    }
+}
+
 class ChatSecureUITests: XCTestCase {
 
     override func setUp() {
@@ -48,6 +55,12 @@ class ChatSecureUITests: XCTestCase {
         setupSnapshot(app)
 
         // In UI tests it’s important to set the initial state - such as interface orientation - required for your tests before they run. The setUp method is a good place to do this.
+        
+        if UIDevice.current.userInterfaceIdiom == .pad {
+            XCUIDevice.shared.orientation = .landscapeLeft
+        } else {
+            XCUIDevice.shared.orientation = .portrait
+        }
     }
 
     override func tearDown() {
@@ -60,7 +73,7 @@ class ChatSecureUITests: XCTestCase {
         app.launchEnvironment["OTRLaunchMode"] = "ChatSecureUITests"
         app.launch()
         skipEnablePush(app)
-        
+        skipDonatePrompt(app)
         XCTAssertTrue(app.buttons[localizedString("Skip")].exists, "Skip button exists")
         XCTAssertTrue(app.buttons[localizedString("Create New Account")].exists, "Create new Account button exists")
         XCTAssertTrue(app.buttons[localizedString("Add Existing Account")].exists, "Add existing account button exists")
@@ -70,18 +83,8 @@ class ChatSecureUITests: XCTestCase {
         let tablesQuery = app.tables
         tablesQuery.cells.containing(.staticText, identifier:localizedString("Nickname")).children(matching: .textField).element.typeText("Alice")
 
-        //This is the done button really
-
-        switch UIDevice.current.userInterfaceIdiom  {
-        case .phone:
-            XCUIApplication().toolbars.buttons.element(boundBy: 2).tap()
-            break
-        case .pad:
-            XCUIApplication().toolbars.buttons.element(boundBy: 3).tap()
-            break
-        default:
-            break
-        }
+        let keyboardDismissButton = app.toolbars["Toolbar"].buttons.element(boundBy: 2)
+        keyboardDismissButton.tap()
 
         tablesQuery.switches[localizedString("Show Advanced Options")].tap()
 
@@ -91,37 +94,36 @@ class ChatSecureUITests: XCTestCase {
         snapshot("01CreateAccountScreen")
     }
 
-    func testConversationList() {
-        let app = XCUIApplication()
-        app.launchEnvironment["OTRLaunchMode"] = "ChatSecureUITestsDemoData"
-        app.launch()
-        skipEnablePush(app)
-        
-        switch UIDevice.current.userInterfaceIdiom  {
-        case .phone:
-            snapshot("02ConversationListScreen")
-            break
-        case .pad:
-            XCUIDevice.shared().orientation = .landscapeLeft
-            break
-        default:
-            break
-        }
-        sleep(2)
-        skipEnablePush(app)
-        XCUIApplication().tables["conversationTableView"].children(matching: .any).element(boundBy: 0).tap()
-        snapshot("03ChatScreen")
-        XCUIApplication().buttons["profileButton"].tap()
-        snapshot("04ProfileScreen")
-        
-//        app.navigationBars["Profile"].buttons["Done"].tap()
-//        
-//        let chatsNavigationBar = app.navigationBars["Chats"]
-//        chatsNavigationBar.buttons["Chats"].tap()
-//        chatsNavigationBar.childrenMatchingType(.Button).elementBoundByIndex(1).tap()
-//        app.tables["settingsTableView"].staticTexts["New Account"].tap()
-//        app.buttons["Create New Account"].tap()
-        
-    }
-    
+//    func testConversationList() {
+//        let app = XCUIApplication()
+//        app.launchEnvironment["OTRLaunchMode"] = "ChatSecureUITestsDemoData"
+//        app.launch()
+//        skipEnablePush(app)
+//
+//        switch UIDevice.current.userInterfaceIdiom  {
+//        case .phone:
+//            snapshot("02ConversationListScreen")
+//            break
+//        case .pad:
+//            break
+//        default:
+//            break
+//        }
+//        sleep(2)
+//        skipEnablePush(app)
+//        XCUIApplication().tables["conversationTableView"].children(matching: .any).element(boundBy: 0).tap()
+//        snapshot("03ChatScreen")
+//        XCUIApplication().buttons["profileButton"].tap()
+//        snapshot("04ProfileScreen")
+//
+////        app.navigationBars["Profile"].buttons["Done"].tap()
+////
+////        let chatsNavigationBar = app.navigationBars["Chats"]
+////        chatsNavigationBar.buttons["Chats"].tap()
+////        chatsNavigationBar.childrenMatchingType(.Button).elementBoundByIndex(1).tap()
+////        app.tables["settingsTableView"].staticTexts["New Account"].tap()
+////        app.buttons["Create New Account"].tap()
+//
+//    }
+//
 }

Gemfile

@@ -1,3 +1,4 @@
 source "https://rubygems.org"
 
-gem 'cocoapods', '~> 1.5.3'
+gem 'cocoapods'
+gem 'fastlane'

Gemfile.lock

@@ -7,7 +7,10 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     atomos (0.1.2)
+    babosa (1.0.2)
     claide (1.0.2)
     cocoapods (1.5.3)
       activesupport (>= 4.0.2, < 5)
@@ -42,35 +45,161 @@ GEM
       nap (>= 0.8, < 2.0)
       netrc (~> 0.11)
     cocoapods-try (1.1.0)
+    colored (1.2)
     colored2 (3.1.2)
+    commander-fastlane (4.4.6)
+      highline (~> 1.7.2)
     concurrent-ruby (1.0.5)
+    declarative (0.0.10)
+    declarative-option (0.1.0)
+    domain_name (0.5.20180417)
+      unf (>= 0.0.5, < 1.0.0)
+    dotenv (2.5.0)
+    emoji_regex (0.1.1)
     escape (0.0.4)
+    excon (0.62.0)
+    faraday (0.15.2)
+      multipart-post (>= 1.2, < 3)
+    faraday-cookie_jar (0.0.6)
+      faraday (>= 0.7.4)
+      http-cookie (~> 1.0.0)
+    faraday_middleware (0.12.2)
+      faraday (>= 0.7.4, < 1.0)
+    fastimage (2.1.3)
+    fastlane (2.99.0)
+      CFPropertyList (>= 2.3, < 4.0.0)
+      addressable (>= 2.3, < 3.0.0)
+      babosa (>= 1.0.2, < 2.0.0)
+      bundler (>= 1.12.0, < 2.0.0)
+      colored
+      commander-fastlane (>= 4.4.6, < 5.0.0)
+      dotenv (>= 2.1.1, < 3.0.0)
+      emoji_regex (~> 0.1)
+      excon (>= 0.45.0, < 1.0.0)
+      faraday (~> 0.9)
+      faraday-cookie_jar (~> 0.0.6)
+      faraday_middleware (~> 0.9)
+      fastimage (>= 2.1.0, < 3.0.0)
+      gh_inspector (>= 1.1.2, < 2.0.0)
+      google-api-client (>= 0.21.2, < 0.22.0)
+      highline (>= 1.7.2, < 2.0.0)
+      json (< 3.0.0)
+      mini_magick (~> 4.5.1)
+      multi_json
+      multi_xml (~> 0.5)
+      multipart-post (~> 2.0.0)
+      plist (>= 3.1.0, < 4.0.0)
+      public_suffix (~> 2.0.0)
+      rubyzip (>= 1.2.1, < 2.0.0)
+      security (= 0.1.3)
+      simctl (~> 1.6.3)
+      slack-notifier (>= 2.0.0, < 3.0.0)
+      terminal-notifier (>= 1.6.2, < 2.0.0)
+      terminal-table (>= 1.4.5, < 2.0.0)
+      tty-screen (>= 0.6.3, < 1.0.0)
+      tty-spinner (>= 0.8.0, < 1.0.0)
+      word_wrap (~> 1.0.0)
+      xcodeproj (>= 1.5.7, < 2.0.0)
+      xcpretty (~> 0.2.8)
+      xcpretty-travis-formatter (>= 0.0.3)
     fourflusher (2.0.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
+    google-api-client (0.21.2)
+      addressable (~> 2.5, >= 2.5.1)
+      googleauth (>= 0.5, < 0.7.0)
+      httpclient (>= 2.8.1, < 3.0)
+      mime-types (~> 3.0)
+      representable (~> 3.0)
+      retriable (>= 2.0, < 4.0)
+    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.10)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
+    httpclient (2.8.3)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
+    json (2.1.0)
+    jwt (2.1.0)
+    little-plugger (1.1.4)
+    logging (2.2.2)
+      little-plugger (~> 1.1)
+      multi_json (~> 1.10)
+    memoist (0.16.0)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_magick (4.5.1)
     minitest (5.11.3)
     molinillo (0.6.5)
+    multi_json (1.13.1)
+    multi_xml (0.6.0)
+    multipart-post (2.0.0)
     nanaimo (0.2.6)
     nap (1.1.0)
+    naturally (2.2.0)
     netrc (0.11.0)
+    os (0.9.6)
+    plist (3.4.0)
+    public_suffix (2.0.5)
+    representable (3.0.4)
+      declarative (< 0.1.0)
+      declarative-option (< 0.2.0)
+      uber (< 0.2.0)
+    retriable (3.1.2)
+    rouge (2.0.7)
     ruby-macho (1.2.0)
+    rubyzip (1.2.1)
+    security (0.1.3)
+    signet (0.8.1)
+      addressable (~> 2.3)
+      faraday (~> 0.9)
+      jwt (>= 1.5, < 3.0)
+      multi_json (~> 1.10)
+    simctl (1.6.5)
+      CFPropertyList
+      naturally
+    slack-notifier (2.3.2)
+    terminal-notifier (1.8.0)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
     thread_safe (0.3.6)
+    tty-cursor (0.5.0)
+    tty-screen (0.6.4)
+    tty-spinner (0.8.0)
+      tty-cursor (>= 0.5.0)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
+    uber (0.1.0)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.5)
+    unicode-display_width (1.4.0)
+    word_wrap (1.0.0)
     xcodeproj (1.5.9)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.2)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
       nanaimo (~> 0.2.5)
+    xcpretty (0.2.8)
+      rouge (~> 2.0.7)
+    xcpretty-travis-formatter (1.0.0)
+      xcpretty (~> 0.2, >= 0.0.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods (~> 1.5.3)
+  cocoapods
+  fastlane
 
 BUNDLED WITH
    1.16.2

Submodules/ChatSecure-Metadata

@@ -0,0 +1,8 @@
+app_identifier("com.chrisballinger.ChatSecure") # The bundle identifier of your app
+apple_id("[email protected]") # Your Apple email address
+
+itc_team_id("246936") # App Store Connect Team ID
+team_id("4T8JLQR6GR") # Developer Portal Team ID
+
+# For more information about the Appfile, see:
+#     https://docs.fastlane.tools/advanced/#appfile