snapshot 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 465b8c37379a1a9a76a3ba13cadb954806c6e7bf
-  data.tar.gz: 73b36f1256f379ee0ff430d5054b92cf9f74adf1
+  metadata.gz: 6ad2e98962df5f2e97ec3c33bede4babdce30168
+  data.tar.gz: bc9ac35cf07d90461d297c20aa3977f5c137e7dc
 SHA512:
-  metadata.gz: 1dbd182b3e65ed03cc67d4aaa841804d8c066c05dbfd2acadc36ad329aeef01565895f07cecddd77f36c0a060e97bd61ccfed54aa780df913bf70f1609208463
-  data.tar.gz: 19451dc63532cc4d2ffaadf9db19c3b36484fb398440fcd8a9230ee5601d85fa557fbb6af65ca0d29c11704689162e0a4d923ed297ab67f5105e051f44883f63
+  metadata.gz: 756b6e5a499083e7dee9a325fb41e7b3820311e18b3f7de6bc61c6be325ccef38a406d3f749e073b5bdc26768a259c8240db630e688348e3af8097466c9082a1
+  data.tar.gz: 9cd8d9b921a58da4bd3333f9be6c40b966c00b2285adb178e9d1eea96c6449aeaf44aed345e6f4ab9a0e8eaa0979d039232a341dad80eac73b99f83cc0dbe15a

data/README.md

@@ -350,8 +350,6 @@ ALL_LANGUAGES = ["da", "de-DE", "el", "en-AU", "en-CA", "en-GB", "en-US", "es-ES
 ## Use a clean status bar
 You can use [SimulatorStatusMagic](https://github.com/shinydevelopment/SimulatorStatusMagic) to clean up the status bar.
 
-If you enable a clean status bar, you have to remove the `waitForLoadingIndicatorToDisappear` from the `SnapshotHelper.swift` code, as it doesn't detect when the loading indicator disappears. 
-
 ## Editing the `Snapfile`
 Change syntax highlighting to *Ruby*.
 
@@ -373,6 +371,9 @@ You can access the language using the `deviceLanguage` variable.
 # Need help?
 Please submit an issue on GitHub and provide information about your setup
 
+# Code of Conduct
+Help us keep `snapshot` open and inclusive. Please read and follow our [Code of Conduct](https://github.com/fastlane/code-of-conduct).
+
 # License
 This project is licensed under the terms of the MIT license. See the LICENSE file.
 

data/lib/assets/SnapfileTemplate

@@ -16,7 +16,7 @@ languages([
   "it-IT"
 ])
 
-# Arguments to pass to the app on launch. See https://github.com/fastlane/snapshot#launch_arguments
+# Arguments to pass to the app on launch. See https://github.com/fastlane/snapshot#launch-arguments
 # launch_arguments("-favColor red")
 
 # The name of the scheme which contains the UI Tests

data/lib/assets/SnapshotHelper.swift

@@ -20,7 +20,7 @@ func setupSnapshot(app: XCUIApplication) {
     Snapshot.setupSnapshot(app)
 }
 
-func snapshot(name: String, waitForLoadingIndicator: Bool = false) {
+func snapshot(name: String, waitForLoadingIndicator: Bool = true) {
     Snapshot.snapshot(name, waitForLoadingIndicator: waitForLoadingIndicator)
 }
 
@@ -61,7 +61,7 @@ class Snapshot: NSObject {
         }
     }
 
-    class func snapshot(name: String, waitForLoadingIndicator: Bool = false) {
+    class func snapshot(name: String, waitForLoadingIndicator: Bool = true) {
         if waitForLoadingIndicator {
             waitForLoadingIndicatorToDisappear()
         }
@@ -75,15 +75,19 @@ class Snapshot: NSObject {
     class func waitForLoadingIndicatorToDisappear() {
         let query = XCUIApplication().statusBars.childrenMatchingType(.Other).elementBoundByIndex(1).childrenMatchingType(.Other)
 
-        let expectedCount = ((UIDevice.currentDevice().userInterfaceIdiom == .Pad) ? 5 : 4)
-
-        while (query.count > UInt(expectedCount)) {
+        while (0..<query.count).map({ query.elementBoundByIndex($0) }).contains({ $0.isLoadingIndicator }) {
             sleep(1)
-            print("Number of Elements in Status Bar: \(query.count)... waiting for status bar to disappear")
+            print("Waiting for loading indicator to disappear...")
         }
     }
 }
 
+extension XCUIElement {
+    var isLoadingIndicator: Bool {
+        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.0]]

data/lib/snapshot/detect_values.rb

@@ -16,7 +16,7 @@ module Snapshot
         config.load_configuration_file(Snapshot.snapfile_name)
       end
 
-      Snapshot.project.select_scheme
+      Snapshot.project.select_scheme(preferred_to_include: "UITests")
 
       # Devices
       unless config[:devices]

data/lib/snapshot/error_handler.rb

@@ -17,6 +17,8 @@ module Snapshot
         case output
         when /com\.apple\.CoreSimulator\.SimError/
           print "The simulator failed to launch - retrying..."
+        when /is not configured for Running/
+          raise TestsFailedException.new, "Scheme is not properly configured, make sure to check out the snapshot README"
         end
       end
 

data/lib/snapshot/options.rb

@@ -60,6 +60,7 @@ module Snapshot
                                      default_value: output_directory),
         FastlaneCore::ConfigItem.new(key: :ios_version,
                                      description: "By default, the latest version should be used automatically. If you want to change it, do it here",
+                                     short_option: "-i",
                                      default_value: Snapshot::LatestIosVersion.version),
         FastlaneCore::ConfigItem.new(key: :stop_after_first_error,
                                      env_name: 'SNAPSHOT_BREAK_ON_FIRST_ERROR',

data/lib/snapshot/setup.rb

@@ -17,7 +17,7 @@ module Snapshot
 
       puts "-------------------------------------------------------".yellow
       puts "Open your Xcode project and make sure to do the following:".yellow
-      puts "1) Add the ./SnapshotHelper.swift to your UI Test target".yellow
+      puts "1) Add the ./fastlane/SnapshotHelper.swift to your UI Test target".yellow
       puts "   You can move the file anywhere you want".yellow
       puts "2) Call `setupSnapshot(app)` when launching your app".yellow
       puts ""

data/lib/snapshot/version.rb

@@ -1,4 +1,4 @@
 module Snapshot
-  VERSION = "1.5.0"
+  VERSION = "1.6.0"
   DESCRIPTION = "Automate taking localized screenshots of your iOS app on every device"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snapshot
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-25 00:00:00.000000000 Z
+date: 2016-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastimage