From bcbe33c66620a1346761d5c6848dd6cf1ae95646 Mon Sep 17 00:00:00 2001
From: Felix Krause <KrauseFx@gmail.com>
Date: Sun, 1 Feb 2015 22:38:14 +0000
Subject: [PATCH] Metadata upload is skipped for beta builds

Updated tests
---
 README.md                          |  2 +-
 lib/deliver/deliver_process.rb     | 20 +++++++++++++-------
 spec/deliver_process_spec.rb       |  2 --
 spec/example_deliver_files_spec.rb |  2 +-
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 3eee3c8..19832e0 100644
--- a/README.md
+++ b/README.md
@@ -191,7 +191,7 @@ beta_ipa do
 end
 ```
 
-and provide `--beta` option when calling `deliver`.
+and provide `--beta` option when calling `deliver`. When running `deliver` with the `--beta` flag enabled, it will **not** upload new app metadata.
 
 #### Implement blocks to run unit tests
 If you're using [fastlane](http://github.com/krausefx/fastlane), run tests and error blocks there.
diff --git a/lib/deliver/deliver_process.rb b/lib/deliver/deliver_process.rb
index 56cc43c..94bc465 100644
--- a/lib/deliver/deliver_process.rb
+++ b/lib/deliver/deliver_process.rb
@@ -36,15 +36,21 @@ def run
         create_app
         verify_app_on_itunesconnect
 
-        load_metadata_from_config_json_folder # the json file generated from the quick start
-        set_app_metadata
-        set_screenshots
+        unless is_beta_build?
+          # App Metdata will not be updated for beta builds
 
-        verify_pdf_file
+          load_metadata_from_config_json_folder # the json file generated from the quick start
+          set_app_metadata
+          set_screenshots
 
-        additional_itc_information # e.g. copyright, age rating
+          verify_pdf_file
 
-        trigger_metadata_upload
+          additional_itc_information # e.g. copyright, age rating
+
+          trigger_metadata_upload
+        end
+
+        # Always upload a new ipa (except if none was given)
         trigger_ipa_upload
 
         call_success_block
@@ -207,7 +213,7 @@ def set_screenshots
     end
 
     def verify_pdf_file
-      if @deploy_information[Deliverer::ValKey::SKIP_PDF] or is_beta_build?
+      if @deploy_information[Deliverer::ValKey::SKIP_PDF]
         Helper.log.debug "PDF verify was skipped"
       else
         # Everything is prepared for the upload
diff --git a/spec/deliver_process_spec.rb b/spec/deliver_process_spec.rb
index c3e34a0..2c253c7 100644
--- a/spec/deliver_process_spec.rb
+++ b/spec/deliver_process_spec.rb
@@ -51,8 +51,6 @@
       end
 
       it "doesn't show error if production ipa is not given and beta build should be uploaded" do
-        Deliver::ItunesTransporter.set_mock_file("spec/responses/transporter/download_valid_apple_id.txt")
-        Deliver::ItunesTransporter.set_mock_file("spec/responses/transporter/upload_valid.txt")
         Deliver::ItunesTransporter.set_mock_file("spec/responses/transporter/upload_valid.txt")
 
         Deliver::Deliverer.new('spec/fixtures/Deliverfiles/DeliverfileBetaProductionIpa', 
diff --git a/spec/example_deliver_files_spec.rb b/spec/example_deliver_files_spec.rb
index a2f5a06..2549e8b 100644
--- a/spec/example_deliver_files_spec.rb
+++ b/spec/example_deliver_files_spec.rb
@@ -215,7 +215,7 @@
 
             it "Successful with custom parameters" do
               expect(File.exists?@tests_path).to eq(false)
-              Deliver::ItunesTransporter.set_mock_file("spec/responses/transporter/upload_valid.txt")
+              Deliver::ItunesTransporter.clear_mock_files # we don't even download the app metadata
               Deliver::ItunesTransporter.set_mock_file("spec/responses/transporter/upload_valid.txt") # the ipa file
               deliv = Deliver::Deliverer.new("./spec/fixtures/Deliverfiles/DeliverfileCallbacks", 
                                 force: true,