Screnshot generation updates

Author: elibud

WordPress/WordPressScreenshotGeneration/SnapshotHelper.swift

@@ -6,13 +6,6 @@
 //  Copyright © 2015 Felix Krause. All rights reserved.
 //
 
-// -----------------------------------------------------
-// IMPORTANT: When modifying this file, make sure to 
-//            increment the version number at the very
-//            bottom of the file to notify users about
-//            the new SnapshotHelper.swift
-// -----------------------------------------------------
-
 import Foundation
 import XCTest
 
@@ -49,7 +42,7 @@ open class Snapshot: NSObject {
 
         do {
             let trimCharacterSet = CharacterSet.whitespacesAndNewlines
-            deviceLanguage = try String(contentsOf: path, encoding: .utf8).trimmingCharacters(in: trimCharacterSet)
+            deviceLanguage = try NSString(contentsOfFile: path, encoding: String.Encoding.utf8.rawValue).trimmingCharacters(in: trimCharacterSet) as String
             app.launchArguments += ["-AppleLanguages", "(\(deviceLanguage))"]
         } catch {
             print("Couldn't detect/set language...")
@@ -65,7 +58,7 @@ open class Snapshot: NSObject {
 
         do {
             let trimCharacterSet = CharacterSet.whitespacesAndNewlines
-            locale = try String(contentsOf: path, encoding: .utf8).trimmingCharacters(in: trimCharacterSet)
+            locale = try NSString(contentsOfFile: path, encoding: String.Encoding.utf8.rawValue).trimmingCharacters(in: trimCharacterSet) as String
         } catch {
             print("Couldn't detect/set locale...")
         }
@@ -84,7 +77,7 @@ open class Snapshot: NSObject {
         app.launchArguments += ["-FASTLANE_SNAPSHOT", "YES", "-ui_testing"]
 
         do {
-            let launchArguments = try String(contentsOf: path, encoding: String.Encoding.utf8)
+            let launchArguments = try NSString(contentsOfFile: path, encoding: String.Encoding.utf8.rawValue) as String
             let regex = try NSRegularExpression(pattern: "(\\\".+?\\\"|\\S+)", options: [])
             let matches = regex.matches(in: launchArguments, options: [], range: NSRange(location:0, length:launchArguments.characters.count))
             let results = matches.map { result -> String in
@@ -107,8 +100,6 @@ open class Snapshot: NSObject {
 
         #if os(tvOS)
             XCUIApplication().childrenMatchingType(.Browser).count
-        #elseif os(OSX)
-            XCUIApplication().typeKey(XCUIKeyboardKeySecondaryFn, modifierFlags: [])
         #else
             XCUIDevice.shared().orientation = .unknown
         #endif
@@ -127,47 +118,21 @@ open class Snapshot: NSObject {
         }
     }
 
-    class func pathPrefix() -> URL? {
-        let homeDir: URL
-        //on OSX config is stored in /Users/<username>/Library
-        //and on iOS/tvOS/WatchOS it's in simulator's home dir
-        #if os(OSX)
-            guard let user = ProcessInfo().environment["USER"] else {
-                print("Couldn't find Snapshot configuration files - can't detect current user ")
-                return nil
-            }
-
-            guard let usersDir =  FileManager.default.urls(for: .userDirectory, in: .localDomainMask).first else {
-                print("Couldn't find Snapshot configuration files - can't detect `Users` dir")
-                return nil
-            }
-
-            homeDir = usersDir.appendingPathComponent(user)
-        #else
-            guard let simulatorHostHome = ProcessInfo().environment["SIMULATOR_HOST_HOME"] else {
-                print("Couldn't find simulator home location. Please, check SIMULATOR_HOST_HOME env variable.")
-                return nil
-            }
-            guard let homeDirUrl = URL(string: simulatorHostHome) else {
-                print("Can't prepare environment. Simulator home location is inaccessible. Does \(simulatorHostHome) exist?")
-                return nil
-            }
-            homeDir = URL(fileURLWithPath: homeDirUrl.path)
-        #endif
-        return homeDir.appendingPathComponent("Library/Caches/tools.fastlane")
+    class func pathPrefix() -> NSString? {
+        if let path = ProcessInfo().environment["SIMULATOR_HOST_HOME"] as NSString? {
+            return path.appendingPathComponent("Library/Caches/tools.fastlane") as NSString?
+        }
+        print("Couldn't find Snapshot configuration files at ~/Library/Caches/tools.fastlane")
+        return nil
     }
 }
 
 extension XCUIElement {
     var isLoadingIndicator: Bool {
-        let whiteListedLoaders = ["GeofenceLocationTrackingOn", "StandardLocationTrackingOn"]
-        if whiteListedLoaders.contains(self.identifier) {
-            return false
-        }
         return self.frame.size == CGSize(width: 10, height: 20)
     }
 }
 
 // Please don't remove the lines below
 // They are used to detect outdated configuration files
-// SnapshotHelperVersion [1.4]
+// SnapshotHelperVersion [1.2]

WordPress/WordPressScreenshotGeneration/WordPressScreenshotGeneration.swift

@@ -44,21 +44,22 @@ class WordPressScreenshotGeneration: XCTestCase {
 
         // Login
         let username = ""
+        let password = ""
 
         let usernameEmailTextField =  app.textFields["Email or username"]
         usernameEmailTextField.tap()
         usernameEmailTextField.typeText(username)
         app.buttons["Next Button"].tap()
 
-
         let passwordSecureTextField = app.secureTextFields["Password"]
         passwordSecureTextField.tap()
-        passwordSecureTextField.typeText("")
+        passwordSecureTextField.typeText(password)
 
         app.buttons["Log In Button"].tap()
 
         // Get Reader Screenshot
         app.tabBars["Main Navigation"].buttons["readerTabButton"].tap(withNumberOfTaps: 2, numberOfTouches: 2)
+        sleep(2)
         //app.tables.staticTexts["Discover"].tap()
         app.tables.cells.element(boundBy: 1).tap() // tap Discover
         sleep(5)