earlgrey 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e2c1475df8675f191c0fbf6eb330bb3bd33b824
-  data.tar.gz: 329f733ec79f4c3c480b867a65ac0c1c56ba8c66
+  metadata.gz: 11cbb8397c02fad28c1a9540138d60fec164964c
+  data.tar.gz: 56cdee3bd95121a638c3da2c68b1ed2a4959fb17
 SHA512:
-  metadata.gz: de03ac8b34e3cd50a69616829b1ae517966950ea23559231da09018f9984635b646b6d6f6a5c1c948cf1ebb7a467c51c98d3b3f67f39d0c0478bcd79ee8a6084
-  data.tar.gz: 4df7deec361904a5b7696a7a561b946f34f69ae0446574bb30e74da19caac4b32b69eb3ba0c3f5a7714f6f7e43489b000b4130ffff90081d582710b5657dd221
+  metadata.gz: bde9b7f311fc7355be93dd48e27dfdd7e5ec13954a6815ab30f55c56bbad8e436742f8c2490ca126daf81d40bc63c296330401e38dc788d09346064a2d0ec279
+  data.tar.gz: ff4b8ae1225ae473f0cf4c0a6c85e9b90cb56298fd1c29bfec5ec8172c66d4fcceb20d26eb38bff42ec966e00bc06ebaa20beef1fb706e070818517c08f46d0a

data/lib/earlgrey/configure_earlgrey.rb

@@ -120,8 +120,7 @@ module EarlGrey
       scheme = modify_scheme_for_actions
 
       # Add a Copy Files Build Phase for EarlGrey.framework to embed it into the app under test.
-      # carthage uses carthage copy-frameworks instead of a copy files build phase.
-      add_earlgrey_copy_files_script unless carthage
+      add_earlgrey_copy_files_script
 
       # Add header/framework search paths for carthage
       add_carthage_search_paths
@@ -375,7 +374,7 @@ module EarlGrey
         target_files = test_target_group.files
         earlgrey_swift_file_ref = target_files.find { |f| f.display_name == src_swift_name }
         raise 'EarlGrey.swift not found in testing target' unless earlgrey_swift_file_ref
-        test_target.source_build_phase.add_file_reference earlgrey_swift_file_ref
+        test_target.source_build_phase.add_file_reference(earlgrey_swift_file_ref, true)
       end
 
       # Link Binary With Libraries - frameworks_build_phase - Add EarlGrey.framework
@@ -383,18 +382,8 @@ module EarlGrey
       existing_frameworks = test_target.frameworks_build_phase.files.map(&:display_name)
       unless existing_frameworks.include? earlgrey_framework
         framework_ref = add_earlgrey_product
-        test_target.frameworks_build_phase.add_file_reference framework_ref
-      end
-
-      if carthage
-        # Add shell script phase
-        shell_script_name = 'Carthage copy-frameworks Run Script'
-        unless test_target.shell_script_build_phases.map(&:name).include?(shell_script_name)
-          shell_script = test_target.new_shell_script_build_phase shell_script_name
-          shell_script.shell_path = '/bin/bash'
-          shell_script.shell_script = '/usr/local/bin/carthage copy-frameworks'
-          shell_script.input_paths = ['$(SRCROOT)/Carthage/Build/iOS/EarlGrey.framework']
-        end
+        # must pass 'true' to avoid duplicates
+        test_target.frameworks_build_phase.add_file_reference(framework_ref, true)
       end
 
       user_project.save

data/lib/earlgrey/files/Swift-2.3/EarlGrey.swift

@@ -102,6 +102,7 @@ public func GREYFailWithDetails(reason: String, details: String) {
 private func GREYAssert(@autoclosure expression: () -> BooleanType,
                         _ reason: String, details: String) {
   GREYSetCurrentAsFailable()
+  GREYWaitUntilIdle()
   if !expression().boolValue {
     greyFailureHandler.handleException(GREYFrameworkException(name: kGREYAssertionFailedException,
       reason: reason),
@@ -109,6 +110,10 @@ private func GREYAssert(@autoclosure expression: () -> BooleanType,
   }
 }
 
+private func GREYWaitUntilIdle() {
+  GREYUIThreadExecutor.sharedInstance().drainUntilIdle()
+}
+
 private func GREYSetCurrentAsFailable(file: String = #file, line: UInt = #line) {
   let greyFailureHandlerSelector =
       #selector(GREYFailureHandler.setInvocationFile(_:andInvocationLine:))

data/lib/earlgrey/files/Swift-3.0/EarlGrey.swift

@@ -74,6 +74,7 @@ public func GREYFailWithDetails(_ reason: String, details: String) {
 private func GREYAssert(_ expression: @autoclosure () -> Bool,
                         _ reason: String, details: String) {
   GREYSetCurrentAsFailable()
+  GREYWaitUntilIdle()
   if !expression() {
     EarlGrey.handle(exception: GREYFrameworkException(name: kGREYAssertionFailedException,
                                                       reason: reason),
@@ -91,6 +92,10 @@ private func GREYSetCurrentAsFailable() {
   }
 }
 
+private func GREYWaitUntilIdle() {
+  GREYUIThreadExecutor.sharedInstance().drainUntilIdle()
+}
+
 open class EarlGrey: NSObject {
   open class func select(elementWithMatcher matcher:GREYMatcher,
                            file: StaticString = #file,
@@ -115,13 +120,13 @@ open class EarlGrey: NSObject {
   }
 
   @discardableResult open class func rotateDeviceTo(orientation: UIDeviceOrientation,
-                                                      errorOrNil: UnsafeMutablePointer<NSError?>!,
-                                                      file: StaticString = #file,
-                                                      line: UInt = #line)
+                                                    errorOrNil: UnsafeMutablePointer<NSError?>!,
+                                                    file: StaticString = #file,
+                                                    line: UInt = #line)
     -> Bool {
     return EarlGreyImpl.invoked(fromFile: file.description, lineNumber: line)
-            .rotateDevice(to: orientation,
-                          errorOrNil: errorOrNil)
+             .rotateDevice(to: orientation,
+                           errorOrNil: errorOrNil)
   }
 }
 
@@ -140,3 +145,14 @@ extension GREYInteraction {
     return self.usingSearch(searchAction, onElementWith: matcher)
   }
 }
+
+extension GREYCondition {
+  open func waitWithTimeout(seconds: CFTimeInterval) -> Bool {
+    return self.wait(withTimeout: seconds)
+  }
+
+  open func waitWithTimeout(seconds: CFTimeInterval, pollInterval: CFTimeInterval)
+    -> Bool {
+    return self.wait(withTimeout: seconds, pollInterval: pollInterval)
+  }
+}

data/lib/earlgrey/version.rb

@@ -14,5 +14,5 @@
 #  limitations under the License.
 
 module EarlGrey
-  VERSION = '0.1.5'.freeze unless defined? ::EarlGrey::VERSION
+  VERSION = '0.1.6'.freeze unless defined? ::EarlGrey::VERSION
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: earlgrey
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - khandpur
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-07 00:00:00.000000000 Z
+date: 2017-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -159,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: EarlGrey installer gem