[fastlane_core] strip upload param env before checking (#16783)

fastlane · Jul 7, 2020 · b8dd142 · b8dd142
1 parent f2e2f8d
commit b8dd142
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 1 deletion.
diff --git a/fastlane_core/lib/fastlane_core/itunes_transporter.rb b/fastlane_core/lib/fastlane_core/itunes_transporter.rb
@@ -155,7 +155,7 @@ def additional_upload_parameters
       # It became crucial after WWDC 2020 as it leaded to "Broken pipe (Write failed)" exception
       # More information https://github.com/fastlane/fastlane/issues/16749
       env_deliver_additional_params = ENV["DELIVER_ITMSTRANSPORTER_ADDITIONAL_UPLOAD_PARAMETERS"]
-      if env_deliver_additional_params.to_s.empty?
+      if env_deliver_additional_params.to_s.strip.empty?
         return nil
       end
 

diff --git a/fastlane_core/spec/itunes_transporter_spec.rb b/fastlane_core/spec/itunes_transporter_spec.rb
@@ -216,6 +216,17 @@ def xcrun_download_command(provider_short_name = nil)
           after(:each) { ENV.delete("DELIVER_ITMSTRANSPORTER_ADDITIONAL_UPLOAD_PARAMETERS") }
         end
 
+        describe "upload command generation with DELIVER_ITMSTRANSPORTER_ADDITIONAL_UPLOAD_PARAMETERS set to empty string" do
+          before(:each) { ENV["DELIVER_ITMSTRANSPORTER_ADDITIONAL_UPLOAD_PARAMETERS"] = " " }
+
+          it 'generates a call to java directly' do
+            transporter = FastlaneCore::ItunesTransporter.new(email, password)
+            expect(transporter.upload('my.app.id', '/tmp')).to eq(java_upload_command)
+          end
+
+          after(:each) { ENV.delete("DELIVER_ITMSTRANSPORTER_ADDITIONAL_UPLOAD_PARAMETERS") }
+        end
+
         describe "download command generation" do
           it 'generates a call to java directly' do
             transporter = FastlaneCore::ItunesTransporter.new(email, password)
@@ -379,6 +390,17 @@ def xcrun_download_command(provider_short_name = nil)
         after(:each) { ENV.delete("DELIVER_ITMSTRANSPORTER_ADDITIONAL_UPLOAD_PARAMETERS") }
       end
 
+      describe "upload command generation with DELIVER_ITMSTRANSPORTER_ADDITIONAL_UPLOAD_PARAMETERS set to empty string" do
+        before(:each) { ENV["DELIVER_ITMSTRANSPORTER_ADDITIONAL_UPLOAD_PARAMETERS"] = " " }
+
+        it 'generates a call to java directly' do
+          transporter = FastlaneCore::ItunesTransporter.new(email, password)
+          expect(transporter.upload('my.app.id', '/tmp')).to eq(shell_upload_command)
+        end
+
+        after(:each) { ENV.delete("DELIVER_ITMSTRANSPORTER_ADDITIONAL_UPLOAD_PARAMETERS") }
+      end
+
       describe "download command generation" do
         it 'generates a call to the shell script' do
           transporter = FastlaneCore::ItunesTransporter.new(email, password, false)
@@ -420,6 +442,17 @@ def xcrun_download_command(provider_short_name = nil)
         after(:each) { ENV.delete("DELIVER_ITMSTRANSPORTER_ADDITIONAL_UPLOAD_PARAMETERS") }
       end
 
+      describe "upload command generation with DELIVER_ITMSTRANSPORTER_ADDITIONAL_UPLOAD_PARAMETERS set with empty string" do
+        before(:each) { ENV["DELIVER_ITMSTRANSPORTER_ADDITIONAL_UPLOAD_PARAMETERS"] = " " }
+
+        it 'generates a call to java directly' do
+          transporter = FastlaneCore::ItunesTransporter.new(email, password)
+          expect(transporter.upload('my.app.id', '/tmp')).to eq(java_upload_command_9)
+        end
+
+        after(:each) { ENV.delete("DELIVER_ITMSTRANSPORTER_ADDITIONAL_UPLOAD_PARAMETERS") }
+      end
+
       describe "download command generation" do
         it 'generates a call to java directly' do
           transporter = FastlaneCore::ItunesTransporter.new(email, password, false)
@@ -454,6 +487,17 @@ def xcrun_download_command(provider_short_name = nil)
         after(:each) { ENV.delete("DELIVER_ITMSTRANSPORTER_ADDITIONAL_UPLOAD_PARAMETERS") }
       end
 
+      describe "upload command generation with DELIVER_ITMSTRANSPORTER_ADDITIONAL_UPLOAD_PARAMETERS set with empty string" do
+        before(:each) { ENV["DELIVER_ITMSTRANSPORTER_ADDITIONAL_UPLOAD_PARAMETERS"] = " " }
+
+        it 'generates a call to java directly' do
+          transporter = FastlaneCore::ItunesTransporter.new(email, password)
+          expect(transporter.upload('my.app.id', '/tmp')).to eq(xcrun_upload_command)
+        end
+
+        after(:each) { ENV.delete("DELIVER_ITMSTRANSPORTER_ADDITIONAL_UPLOAD_PARAMETERS") }
+      end
+
       describe "download command generation" do
         it 'generates a call to xcrun iTMSTransporter' do
           transporter = FastlaneCore::ItunesTransporter.new(email, password, false)