Combine test helperes

Author: jkmassel

spec/spec_helper.rb

@@ -83,25 +83,14 @@ def in_tmp_dir
 end
 
 # Executes the given block with a temporary file with the given `file_name`
-def with_tmp_file_path_for_file_named(file_name)
+def with_tmp_file(named: nil, content: '')
   in_tmp_dir do |tmp_dir|
+    file_name = named || ('a'..'z').to_a.sample(8).join # 8-character random file name if nil
     file_path = File.join(tmp_dir, file_name)
 
-    File.write(file_path, '')
+    File.write(file_path, content)
     yield file_path
   ensure
     File.delete(file_path)
   end
 end
-
-# Executes the given block with a temporary file
-def with_tmp_file_path
-  in_tmp_dir do |tmp_dir|
-    file_name = ('a'..'z').to_a.sample(8).join # 8-character random file name
-    file_path = File.join(tmp_dir, file_name)
-
-    File.write(file_path, '')
-    yield file_path
-    File.delete(file_path)
-  end
-end

spec/upload_to_s3_spec.rb

@@ -21,7 +21,7 @@ def stub_s3_response_for_file(key, exists: true)
       expected_key = '939c39398db2405e791e205778ff70f85dff620e/a8c-key1'
       stub_s3_response_for_file(expected_key, exists: false)
 
-      with_tmp_file_path_for_file_named('input_file_1') do |file_path|
+      with_tmp_file(named: 'input_file_1') do |file_path|
         expect(client).to receive(:put_object).with(body: file_instance_of(file_path), bucket: test_bucket, key: expected_key)
 
         return_value = run_described_fastlane_action(
@@ -39,7 +39,7 @@ def stub_s3_response_for_file(key, exists: true)
       expected_key = '8bde1a7a04300df27b52f4383dc997e5fbbff180/a8c-key2'
       stub_s3_response_for_file(expected_key, exists: false)
 
-      with_tmp_file_path_for_file_named('input_file_2') do |file_path|
+      with_tmp_file(named: 'input_file_2') do |file_path|
         expect(client).to receive(:put_object).with(body: file_instance_of(file_path), bucket: test_bucket, key: expected_key)
 
         return_value = run_described_fastlane_action(
@@ -58,7 +58,7 @@ def stub_s3_response_for_file(key, exists: true)
       expected_key = 'a8c-key1'
       stub_s3_response_for_file(expected_key, exists: false)
 
-      with_tmp_file_path do |file_path|
+      with_tmp_file do |file_path|
         expect(client).to receive(:put_object).with(body: file_instance_of(file_path), bucket: test_bucket, key: expected_key)
 
         return_value = run_described_fastlane_action(
@@ -77,7 +77,7 @@ def stub_s3_response_for_file(key, exists: true)
       expected_key = '939c39398db2405e791e205778ff70f85dff620e/subdir/a8c-key1'
       stub_s3_response_for_file(expected_key, exists: false)
 
-      with_tmp_file_path_for_file_named('input_file_1') do |file_path|
+      with_tmp_file(named: 'input_file_1') do |file_path|
         expect(client).to receive(:put_object).with(body: file_instance_of(file_path), bucket: test_bucket, key: expected_key)
 
         return_value = run_described_fastlane_action(
@@ -95,7 +95,7 @@ def stub_s3_response_for_file(key, exists: true)
       expected_key = 'c125bd799c6aad31092b02e440a8fae25b45a2ad/test_file_1'
       stub_s3_response_for_file(expected_key, exists: false)
 
-      with_tmp_file_path_for_file_named('test_file_1') do |file_path|
+      with_tmp_file(named: 'test_file_1') do |file_path|
         expect(client).to receive(:put_object).with(body: file_instance_of(file_path), bucket: test_bucket, key: expected_key)
 
         return_value = run_described_fastlane_action(
@@ -112,7 +112,7 @@ def stub_s3_response_for_file(key, exists: true)
   describe 'uploading a file with invalid parameters' do
     it 'fails if bucket is empty or nil' do
       expect do
-        with_tmp_file_path do |file_path|
+        with_tmp_file do |file_path|
           run_described_fastlane_action(
             bucket: '',
             key: 'key',
@@ -124,7 +124,7 @@ def stub_s3_response_for_file(key, exists: true)
 
     it 'fails if an empty key is provided' do
       expect do
-        with_tmp_file_path do |file_path|
+        with_tmp_file do |file_path|
           run_described_fastlane_action(
             bucket: test_bucket,
             key: '',
@@ -148,7 +148,7 @@ def stub_s3_response_for_file(key, exists: true)
       expected_key = 'a62f2225bf70bfaccbc7f1ef2a397836717377de/key'
       stub_s3_response_for_file(expected_key)
 
-      with_tmp_file_path_for_file_named('key') do |file_path|
+      with_tmp_file(named: 'key') do |file_path|
         expect do
           run_described_fastlane_action(
             bucket: test_bucket,