Merge pull request #1741 from StoDevX/accessibility-homescreen-buttons

hawkrives · web-flow · commit da0f6fc4068f · 2017-10-03T00:49:32.000-05:00
Make homescreen buttons be buttons
diff --git a/fastlane/platforms/ios.rb b/fastlane/platforms/ios.rb
@@ -6,10 +6,20 @@
 
   desc 'Take screenshots'
   lane :screenshot do
-    snapshot(devices: ['iPhone 7 Plus', 'iPhone 6', 'iPhone 5s'],
+    devices = [
+      'iPhone 7 Plus',
+      'iPhone 6',
+      'iPhone 5s',
+      # 'iPhone 4s',
+      'iPad Pro (9.7-inch)',
+      'iPad Pro (12.9-inch)',
+   ]
+    snapshot(devices: devices,
              languages: ['en-US'],
              scheme: ENV['GYM_SCHEME'],
-             project: ENV['GYM_PROJECT'])
+             project: ENV['GYM_PROJECT'],
+             # concurrent_simulators: false,
+             number_of_retries: 0)
   end
 
   desc 'Builds the app'
diff --git a/ios/AllAboutOlafUITests/AllAboutOlafUITests.swift b/ios/AllAboutOlafUITests/AllAboutOlafUITests.swift
@@ -39,80 +39,81 @@ class AllAboutOlafUITests: XCTestCase {
     }
 
     func testOpenMenusScreen() {
-        app.otherElements["   Menus"].tap()
+        app.buttons["Menus"].tap()
         sleep(5)
         snapshot("01MenusScreenStavMenu")
     }
 
     func testOpenSisScreen() {
-        app.otherElements["   SIS"].tap()
+        app.buttons["SIS"].tap()
         sleep(1)
         snapshot("02SisScreen")
     }
 
     func testOpenBuildingHoursScreen() {
-        app.otherElements["   Building Hours"].tap()
+        app.buttons["Building Hours"].tap()
         sleep(1)
         snapshot("03BuildingHoursScreen")
     }
 
     func testOpenWebcamsScreen() {
-        app.otherElements["   Streaming Media"].tap()
-        app.tabBars.buttons["Webcams"].tap()
+        app.buttons["Streaming Media"].tap()
+        app.otherElements["  Webcams"].tap()
         sleep(1)
         snapshot("04WebcamsScreen")
     }
 
     func testOpenCalendarScreen() {
-        app.otherElements["   Calendar"].tap()
+        app.buttons["Calendar"].tap()
         sleep(5)
         snapshot("05CalendarScreen")
     }
 
     func testOpenDirectoryScreen() {
-        app.otherElements["   Directory"].tap()
+        app.buttons["Directory"].tap()
         sleep(5)
         snapshot("06DirectoryScreen")
     }
 
     func testOpenStreamingMediaScreen() {
-        app.otherElements["   Streaming Media"].tap()
+        app.buttons["Streaming Media"].tap()
         sleep(1)
         snapshot("07StreamingMediaScreen")
     }
 
     func testOpenNewsScreen() {
-        app.otherElements["   News"].tap()
+        app.buttons["News"].tap()
         sleep(5)
         snapshot("08NewsScreen")
     }
 
     func testOpenCampusMapScreen() {
-        app.otherElements["   Campus Map"].tap()
+        app.buttons["Campus Map"].tap()
+                
         sleep(5)
         snapshot("09CampusMapScreen")
     }
 
     func testOpenImportantContactsScreen() {
-        app.otherElements["   Important Contacts"].tap()
+        app.buttons["Important Contacts"].tap()
         sleep(1)
         snapshot("10ImportantContactsScreen")
     }
 
     func testOpenTransportationScreen() {
-        app.otherElements["   Transportation"].tap()
+        app.buttons["Transportation"].tap()
         sleep(1)
         snapshot("11TransportationScreen")
     }
 
     func testOpenCampusDictionaryScreen() {
-        app.otherElements["   Campus Dictionary"].tap()
+        app.buttons["Campus Dictionary"].tap()
         sleep(1)
         snapshot("12CampusDictionaryScreen")
     }
 
     func testOpenStudentOrgsScreen() {
-        app.otherElements["   Student Orgs"].tap()
+        app.buttons["Student Orgs"].tap()
         sleep(5)
         snapshot("13StudentOrgsScreen")
     }
diff --git a/ios/fastlane/SnapshotHelper.swift b/ios/fastlane/SnapshotHelper.swift
@@ -7,7 +7,7 @@
 //
 
 // -----------------------------------------------------
-// IMPORTANT: When modifying this file, make sure to 
+// 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
@@ -32,20 +32,48 @@ func snapshot(_ name: String, waitForLoadingIndicator: Bool = true) {
     Snapshot.snapshot(name, waitForLoadingIndicator: waitForLoadingIndicator)
 }
 
+enum SnapshotError: Error, CustomDebugStringConvertible {
+    case cannotDetectUser
+    case cannotFindHomeDirectory
+    case cannotFindSimulatorHomeDirectory
+    case cannotAccessSimulatorHomeDirectory(String)
+    
+    var debugDescription: String {
+        switch self {
+        case .cannotDetectUser:
+            return "Couldn't find Snapshot configuration files - can't detect current user "
+        case .cannotFindHomeDirectory:
+            return "Couldn't find Snapshot configuration files - can't detect `Users` dir"
+        case .cannotFindSimulatorHomeDirectory:
+            return "Couldn't find simulator home location. Please, check SIMULATOR_HOST_HOME env variable."
+        case .cannotAccessSimulatorHomeDirectory(let simulatorHostHome):
+            return "Can't prepare environment. Simulator home location is inaccessible. Does \(simulatorHostHome) exist?"
+        }
+    }
+}
+
 open class Snapshot: NSObject {
+    static var app: XCUIApplication!
+    static var cacheDirectory: URL!
+    static var screenshotsDirectory: URL? {
+        return cacheDirectory.appendingPathComponent("screenshots", isDirectory: true)
+    }
 
     open class func setupSnapshot(_ app: XCUIApplication) {
-        setLanguage(app)
-        setLocale(app)
-        setLaunchArguments(app)
+        do {
+            let cacheDir = try pathPrefix()
+            Snapshot.cacheDirectory = cacheDir
+            Snapshot.app = app
+            setLanguage(app)
+            setLocale(app)
+            setLaunchArguments(app)
+        } catch let error {
+            print(error)
+        }
     }
 
     class func setLanguage(_ app: XCUIApplication) {
-        guard let prefix = pathPrefix() else {
-            return
-        }
-
-        let path = prefix.appendingPathComponent("language.txt")
+        let path = cacheDirectory.appendingPathComponent("language.txt")
 
         do {
             let trimCharacterSet = CharacterSet.whitespacesAndNewlines
@@ -57,11 +85,7 @@ open class Snapshot: NSObject {
     }
 
     class func setLocale(_ app: XCUIApplication) {
-        guard let prefix = pathPrefix() else {
-            return
-        }
-
-        let path = prefix.appendingPathComponent("locale.txt")
+        let path = cacheDirectory.appendingPathComponent("locale.txt")
 
         do {
             let trimCharacterSet = CharacterSet.whitespacesAndNewlines
@@ -76,11 +100,7 @@ open class Snapshot: NSObject {
     }
 
     class func setLaunchArguments(_ app: XCUIApplication) {
-        guard let prefix = pathPrefix() else {
-            return
-        }
-
-        let path = prefix.appendingPathComponent("snapshot-launch_arguments.txt")
+        let path = cacheDirectory.appendingPathComponent("snapshot-launch_arguments.txt")
         app.launchArguments += ["-FASTLANE_SNAPSHOT", "YES", "-ui_testing"]
 
         do {
@@ -105,12 +125,18 @@ open class Snapshot: NSObject {
 
         sleep(1) // Waiting for the animation to be finished (kind of)
 
-        #if os(tvOS)
-            XCUIApplication().childrenMatchingType(.Browser).count
-        #elseif os(OSX)
+        #if os(OSX)
             XCUIApplication().typeKey(XCUIKeyboardKeySecondaryFn, modifierFlags: [])
         #else
-            XCUIDevice.shared().orientation = .unknown
+            let screenshot = app.windows.firstMatch.screenshot()
+            guard let simulator = ProcessInfo().environment["SIMULATOR_DEVICE_NAME"], let screenshotsDir = screenshotsDirectory else { return }
+            let path = screenshotsDir.appendingPathComponent("\(simulator)-\(name).png")
+            do {
+                try screenshot.pngRepresentation.write(to: path)
+            } catch let error {
+                print("Problem writing screenshot: \(name) to \(path)")
+                print(error)
+            }
         #endif
     }
 
@@ -127,30 +153,26 @@ open class Snapshot: NSObject {
         }
     }
 
-    class func pathPrefix() -> URL? {
+    class func pathPrefix() throws -> 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
+        // 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
+                throw SnapshotError.cannotDetectUser
             }
 
             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
+                throw SnapshotError.cannotFindHomeDirectory
             }
 
             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
+                throw SnapshotError.cannotFindSimulatorHomeDirectory
             }
             guard let homeDirUrl = URL(string: simulatorHostHome) else {
-                print("Can't prepare environment. Simulator home location is inaccessible. Does \(simulatorHostHome) exist?")
-                return nil
+                throw SnapshotError.cannotAccessSimulatorHomeDirectory(simulatorHostHome)
             }
             homeDir = URL(fileURLWithPath: homeDirUrl.path)
         #endif
@@ -170,4 +192,4 @@ extension XCUIElement {
 
 // Please don't remove the lines below
 // They are used to detect outdated configuration files
-// SnapshotHelperVersion [1.4]
+// SnapshotHelperVersion [1.5]
diff --git a/source/views/home/button.js b/source/views/home/button.js
@@ -7,20 +7,22 @@ import type {ViewType} from '../views'
 import {Touchable} from '../components/touchable'
 import * as c from '../components/colors'
 
-export function HomeScreenButton({
-  view,
-  onPress,
-}: {
+type Props = {
   view: ViewType,
   onPress: () => any,
-}) {
+}
+
+export function HomeScreenButton({view, onPress}: Props) {
   const style = {backgroundColor: view.tint}
 
   return (
     <Touchable
       highlight={false}
       onPress={onPress}
       style={[styles.rectangle, style]}
+      accessibilityLabel={view.title}
+      accessibilityTraits="button"
+      accessibilityComponentType="button"
     >
       <Icon name={view.icon} size={32} style={styles.rectangleButtonIcon} />
       <Text style={styles.rectangleButtonText}>{view.title}</Text>
