Merge pull request #31 from abhinvv1/master

Add ios keychain support param

Author: rajpatta

lib/fastlane/plugin/browserstack/actions/upload_to_browserstack_app_automate_action.rb

@@ -16,12 +16,14 @@ def self.run(params)
         browserstack_access_key = params[:browserstack_access_key] # Required
         custom_id = params[:custom_id]
         file_path = params[:file_path].to_s # Required
+        ios_keychain_support = params[:ios_keychain_support]
 
         validate_file_path(file_path)
+        validate_ios_keychain_support(ios_keychain_support) unless ios_keychain_support.nil?
 
         UI.message("Uploading app to BrowserStack AppAutomate...")
 
-        browserstack_app_id = Helper::BrowserstackHelper.upload_file(browserstack_username, browserstack_access_key, file_path, UPLOAD_API_ENDPOINT, custom_id)
+        browserstack_app_id = Helper::BrowserstackHelper.upload_file(browserstack_username, browserstack_access_key, file_path, UPLOAD_API_ENDPOINT, custom_id, ios_keychain_support)
 
         # Set 'BROWSERSTACK_APP_ID' environment variable, if app upload was successful.
         ENV['BROWSERSTACK_APP_ID'] = browserstack_app_id
@@ -45,6 +47,19 @@ def self.validate_file_path(file_path)
         end
       end
 
+      # Validate ios_keychain_support
+      def self.validate_ios_keychain_support(ios_keychain_support)
+        platform = Actions.lane_context[Actions::SharedValues::PLATFORM_NAME]
+        if !platform.nil? && platform != :ios
+          # Check if platform is specified and not ios
+          # If so, then raise error.
+          UI.user_error!("ios_keychain_support param can only be used with platform ios")
+        end
+        unless ['true', 'false'].include?(ios_keychain_support.to_s)
+          UI.user_error!("ios_keychain_support should be either 'true' or 'false'.")
+        end
+      end
+
       def self.description
         "Uploads IPA and APK files to BrowserStack AppAutomate for running automated tests."
       end
@@ -105,7 +120,11 @@ def self.available_options
                                        description: "Path to the app file",
                                        optional: true,
                                        is_string: true,
-                                       default_value: default_file_path)
+                                       default_value: default_file_path),
+          FastlaneCore::ConfigItem.new(key: :ios_keychain_support,
+                                       description: "Enable/disable support for iOS keychain",
+                                       optional: true,
+                                       is_string: true)
         ]
       end
 

lib/fastlane/plugin/browserstack/helper/browserstack_helper.rb

@@ -20,7 +20,7 @@ def self.show_message
       # +custom_id+:: Custom id for app upload.
       # +file_path+:: Path to the file to be uploaded.
       # +url+:: BrowserStack's app upload endpoint.
-      def self.upload_file(browserstack_username, browserstack_access_key, file_path, url, custom_id = nil)
+      def self.upload_file(browserstack_username, browserstack_access_key, file_path, url, custom_id = nil, ios_keychain_support = nil)
         payload = {
           multipart: true,
           file: File.new(file_path, 'rb')
@@ -30,6 +30,10 @@ def self.upload_file(browserstack_username, browserstack_access_key, file_path,
           payload[:data] = '{ "custom_id": "' + custom_id + '" }'
         end
 
+        unless ios_keychain_support.nil?
+          payload[:ios_keychain_support] = ios_keychain_support
+        end
+
         headers = {
           "User-Agent" => "browserstack_fastlane_plugin"
         }

lib/fastlane/plugin/browserstack/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module Browserstack
-    VERSION = "0.3.3"
+    VERSION = "0.3.4"
   end
 end

spec/fixtures/HelloWorld.ipa

@@ -146,5 +146,25 @@
         end").runner.execute(:test)
       expect(ENV['BROWSERSTACK_APP_ID']).to eq(custom_id)
     end
+
+    it "should work with ios keychain support" do
+      ENV['BROWSERSTACK_APP_ID'] = nil
+      Fastlane::Actions.lane_context[Fastlane::Actions::SharedValues::IPA_OUTPUT_PATH] = nil
+      expect(RestClient::Request).to receive(:execute).and_return({ "app_url" => "bs://app_url", "ios_keychain_support" => true }.to_json)
+      fastfile = Fastlane::FastFile.new.parse("
+        platform :ios do
+          lane :test do
+            upload_to_browserstack_app_automate({
+              browserstack_username: 'username',
+              browserstack_access_key: 'access_key',
+              ios_keychain_support: 'true',
+              file_path: File.join(FIXTURE_PATH, 'HelloWorld.ipa')
+            })
+          end
+        end
+      ")
+      fastfile.runner.execute(:test, :ios)
+      expect(ENV['BROWSERSTACK_APP_ID']).to eq("bs://app_url")
+    end
   end
 end