Added handler for :xcodeproj in launch options

calabash · Oct 13, 2016 · 454bf04 · 454bf04
1 parent fb72e8e
commit 454bf04
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/lib/run_loop/detect_aut/detect.rb b/lib/run_loop/detect_aut/detect.rb
@@ -2,9 +2,15 @@ module RunLoop
 
   # @!visibility private
   module DetectAUT
+    @@xcodeproj = nil
+
+    def self.xcodeproj
+      @@xcodeproj
+    end
 
     # @!visibility private
     def self.detect_app_under_test(options)
+      @@xcodeproj = xcodeproj_from_options(options)
       app = self.detect_app(options)
       if app.is_a?(RunLoop::App) || app.is_a?(RunLoop::Ipa)
         {
@@ -124,6 +130,16 @@ def globs_for_app_search(base_dir)
 
     private
 
+    # @!visibility private
+    def self.xcodeproj_from_options(options)
+      value = options[:xcodeproj]
+      if value.nil? || value == ""
+        nil
+      else
+        File.expand_path(value)
+      end
+    end
+
     # @!visibility private
     def self.app_from_options(options)
       options[:app] || options[:bundle_id]

diff --git a/lib/run_loop/detect_aut/xcode.rb b/lib/run_loop/detect_aut/xcode.rb
@@ -10,8 +10,8 @@ def xcode_project?
       end
 
       # @!visibility private
-      def xcodeproj
-        xcodeproj = RunLoop::Environment.xcodeproj
+      def xcodeproj(options = {})
+        xcodeproj = RunLoop::Environment.xcodeproj || RunLoop::DetectAUT.xcodeproj
 
         if xcodeproj && !File.directory?(xcodeproj)
           raise_xcodeproj_missing(xcodeproj)