rubocop corrections

Author: sethboyles

db/migrations/20221003231438_correct_asg_latest_update_id_column_name.rb

@@ -3,23 +3,23 @@
     if database_type == :mysql
       run <<-SQL
         ALTER TABLE asg_timestamps RENAME COLUMN `{:name=>:id}` to id;
-      SQL
+      SQL.squish
     else
       run <<-SQL
         ALTER TABLE asg_timestamps RENAME COLUMN "{:name=>:id}" to id;
-      SQL
+      SQL.squish
     end
   end
 
   down do
     if database_type == :mysql
       run <<-SQL
         ALTER TABLE asg_timestamps RENAME COLUMN id to `{:name=>:id}`;
-      SQL
+      SQL.squish
     else
       run <<-SQL
         ALTER TABLE asg_timestamps RENAME COLUMN id to "{:name=>:id}";
-      SQL
+      SQL.squish
     end
   end
 end

spec/request/apps_spec.rb

@@ -1980,11 +1980,7 @@
       end
 
       let(:expected_codes_and_responses) do
-<<<<<<< HEAD
         h = Hash.new({ code: 200 }.freeze)
-=======
-        h = Hash.new({code: 200})
->>>>>>> 2f67f926f (more keyword argument fixes)
         h['org_auditor'] = { code: 404 }
         h['org_billing_manager'] = { code: 404 }
         h['no_role'] = { code: 404 }
@@ -2037,11 +2033,7 @@
     context 'permissions for deleting an app' do
       let(:api_call) { ->(user_headers) { delete "/v3/apps/#{app_model.guid}", nil, user_headers } }
       let(:expected_codes_and_responses) do
-<<<<<<< HEAD
         h = Hash.new({ code: 202 }.freeze)
-=======
-        h = Hash.new({code: 202})
->>>>>>> 2f67f926f (more keyword argument fixes)
         %w[admin_read_only global_auditor org_manager space_auditor space_manager space_supporter].each do |r|
           h[r] = { code: 403, errors: CF_NOT_AUTHORIZED }
         end
@@ -2265,11 +2257,7 @@
     context 'permissions for updating an app' do
       let(:api_call) { ->(user_headers) { patch "/v3/apps/#{app_model.guid}", update_request.to_json, user_headers } }
       let(:expected_codes_and_responses) do
-<<<<<<< HEAD
         h = Hash.new({ code: 200, response_object: expected_response_object }.freeze)
-=======
-        h = Hash.new({code: 200, response_object: expected_response_object})
->>>>>>> 2f67f926f (more keyword argument fixes)
         %w[admin_read_only global_auditor org_manager space_auditor space_manager space_supporter].each do |r|
           h[r] = { code: 403, errors: CF_NOT_AUTHORIZED }
         end
@@ -2399,11 +2387,7 @@
         end
 
         let(:expected_codes_and_responses) do
-<<<<<<< HEAD
           h = Hash.new({ code: 403, errors: CF_NOT_AUTHORIZED }.freeze)
-=======
-          h = Hash.new({code: 403, errors: CF_NOT_AUTHORIZED})
->>>>>>> 2f67f926f (more keyword argument fixes)
           h['no_role'] = { code: 404 }
           h['org_auditor'] = { code: 404 }
           h['org_billing_manager'] = { code: 404 }
@@ -2743,11 +2727,7 @@
       end
 
       let(:expected_codes_and_responses) do
-<<<<<<< HEAD
         h = Hash.new({ code: 403, errors: CF_NOT_AUTHORIZED }.freeze)
-=======
-        h = Hash.new({code: 403, errors: CF_NOT_AUTHORIZED})
->>>>>>> 2f67f926f (more keyword argument fixes)
         h['no_role'] = { code: 404 }
         h['org_auditor'] = { code: 404 }
         h['org_billing_manager'] = { code: 404 }
@@ -2916,11 +2896,7 @@
         end
 
         let(:expected_codes_and_responses) do
-<<<<<<< HEAD
           h = Hash.new({ code: 403, errors: CF_NOT_AUTHORIZED }.freeze)
-=======
-          h = Hash.new({code: 403, errors: CF_NOT_AUTHORIZED})
->>>>>>> 2f67f926f (more keyword argument fixes)
           h['no_role'] = { code: 404 }
           h['org_auditor'] = { code: 404 }
           h['org_billing_manager'] = { code: 404 }
@@ -3005,11 +2981,7 @@
     end
 
     let(:expected_codes_and_responses) do
-<<<<<<< HEAD
       h = Hash.new({ code: 200, response_object: expected_response }.freeze)
-=======
-      h = Hash.new({code: 200, response_object: expected_response})
->>>>>>> 2f67f926f (more keyword argument fixes)
       h['no_role'] = { code: 404 }
       h['org_billing_manager'] = { code: 404 }
       h['org_auditor'] = { code: 404 }
@@ -3072,11 +3044,7 @@
       }
     end
     let(:expected_codes_and_responses) do
-<<<<<<< HEAD
       h = Hash.new({ code: 200, response_object: expected_response }.freeze)
-=======
-      h = Hash.new({code: 200, response_object: expected_response})
->>>>>>> 2f67f926f (more keyword argument fixes)
       h['no_role'] = { code: 404 }
       h['org_billing_manager'] = { code: 404 }
       h['org_auditor'] = { code: 404 }
@@ -3134,11 +3102,7 @@
       end
 
       let(:expected_codes_and_responses) do
-<<<<<<< HEAD
         h = Hash.new({ code: 403, errors: CF_NOT_AUTHORIZED }.freeze)
-=======
-        h = Hash.new({code: 403, errors: CF_NOT_AUTHORIZED})
->>>>>>> 2f67f926f (more keyword argument fixes)
         h['no_role'] = { code: 404 }
         h['org_auditor'] = { code: 404 }
         h['org_billing_manager'] = { code: 404 }
@@ -3358,11 +3322,7 @@
       }
     end
     let(:expected_codes_and_responses) do
-<<<<<<< HEAD
       h = Hash.new({ code: 404 }.freeze)
-=======
-      h = Hash.new({code: 404})
->>>>>>> 2f67f926f (more keyword argument fixes)
       %w[global_auditor admin_read_only org_manager space_auditor space_manager].each do |r|
         h[r] = { code: 403, errors: CF_NOT_AUTHORIZED }
       end
@@ -3411,11 +3371,7 @@
 
     it_behaves_like 'permissions for single object endpoint', ALL_PERMISSIONS do
       let(:expected_codes_and_responses) do
-<<<<<<< HEAD
         h = Hash.new({ code: 404 }.freeze)
-=======
-        h = Hash.new({code: 404})
->>>>>>> 2f67f926f (more keyword argument fixes)
         h['global_auditor'] = h['org_manager'] = h['space_auditor'] = h['space_manager'] = { code: 403 }
         h['admin'] = h['admin_read_only'] = h['space_developer'] = h['space_supporter'] = {
           code: 200,
@@ -3432,11 +3388,7 @@
 
       it_behaves_like 'permissions for single object endpoint', ALL_PERMISSIONS do
         let(:expected_codes_and_responses) do
-<<<<<<< HEAD
           h = Hash.new({ code: 404 }.freeze)
-=======
-          h = Hash.new({code: 404})
->>>>>>> 2f67f926f (more keyword argument fixes)
           h['global_auditor'] = h['org_manager'] = h['space_auditor'] = h['space_manager'] = h['space_developer'] = h['space_supporter'] = { code: 403 }
           h['admin'] = h['admin_read_only'] = {
             code: 200,
@@ -3469,11 +3421,7 @@
     end
 
     let(:expected_codes_and_responses) do
-<<<<<<< HEAD
       h = Hash.new({ code: 404 }.freeze)
-=======
-      h = Hash.new({code: 404})
->>>>>>> 2f67f926f (more keyword argument fixes)
       h['admin'] = { code: 200, response_object: read_all_response }
       h['admin_read_only'] = { code: 200, response_object: read_all_response }
       h['global_auditor'] = { code: 200, response_object: read_basic_response }

spec/request/environment_variable_groups_spec.rb

@@ -77,11 +77,7 @@
       let(:org) { VCAP::CloudController::Organization.make }
       let(:space) { VCAP::CloudController::Space.make(organization: org) }
       let(:api_call) { ->(user_headers) { get '/v3/environment_variable_groups/running', nil, user_headers } }
-<<<<<<< HEAD
       let(:expected_codes_and_responses) { Hash.new({ code: 200 }.freeze) }
-=======
-      let(:expected_codes_and_responses) { Hash.new({code: 200}) }
->>>>>>> 2f67f926f (more keyword argument fixes)
 
       before do
         space.organization.add_user(user)
@@ -197,11 +193,7 @@
       end
 
       let(:expected_codes_and_responses) do
-<<<<<<< HEAD
         h = Hash.new({ code: 403 }.freeze)
-=======
-        h = Hash.new({code: 403})
->>>>>>> 2f67f926f (more keyword argument fixes)
         h['admin'] = { code: 200, response_object: env_group_json }
         h
       end

spec/request/isolation_segments_spec.rb

@@ -88,11 +88,7 @@
         let(:user) { VCAP::CloudController::User.make }
 
         let(:expected_codes_and_responses) do
-<<<<<<< HEAD
           h = Hash.new({ code: 200, response_guids: [org1.guid, org2.guid, space.organization.guid] }.freeze)
-=======
-          h = Hash.new({code: 200, response_guids: [org1.guid, org2.guid, space.organization.guid]})
->>>>>>> 2f67f926f (more keyword argument fixes)
           h['org_auditor'] = { code: 200, response_guids: [space.organization.guid] }
           h['org_billing_manager'] = { code: 200, response_guids: [space.organization.guid] }
           h['org_manager'] = { code: 200, response_guids: [space.organization.guid] }
@@ -140,11 +136,7 @@
         let(:user) { VCAP::CloudController::User.make }
 
         let(:expected_codes_and_responses) do
-<<<<<<< HEAD
           h = Hash.new({ code: 200, response_guids: [space1.guid, space2.guid] }.freeze)
-=======
-          h = Hash.new({code: 200, response_guids: [space1.guid, space2.guid]})
->>>>>>> 2f67f926f (more keyword argument fixes)
           h['org_auditor'] = { code: 200, response_guids: [] }
           h['org_billing_manager'] = { code: 200, response_guids: [] }
           h['org_manager'] = { code: 200, response_guids: [space1.guid] }
@@ -238,11 +230,7 @@
         let(:org) { space.organization }
         let(:user) { VCAP::CloudController::User.make }
         let(:expected_codes_and_responses) do
-<<<<<<< HEAD
           h = Hash.new({ code: 200, response_object: expected_response_object }.freeze)
-=======
-          h = Hash.new({code: 200, response_object: expected_response_object})
->>>>>>> 2f67f926f (more keyword argument fixes)
           h['no_role'] = { code: 404 }
           h
         end
@@ -255,11 +243,7 @@
         let(:org) { space.organization }
         let(:user) { VCAP::CloudController::User.make }
         let(:expected_codes_and_responses) do
-<<<<<<< HEAD
           h = Hash.new({ code: 404 }.freeze)
-=======
-          h = Hash.new({code: 404})
->>>>>>> 2f67f926f (more keyword argument fixes)
           h['admin'] = { code: 200, response_object: expected_response_object }
           h['admin_read_only'] = { code: 200, response_object: expected_response_object }
           h['global_auditor'] = { code: 200, response_object: expected_response_object }
@@ -501,11 +485,7 @@
         let(:org) { space.organization }
         let(:user) { VCAP::CloudController::User.make }
         let(:expected_codes_and_responses) do
-<<<<<<< HEAD
           h = Hash.new({ code: 200, response_guids: [iso_seg1.guid] }.freeze)
-=======
-          h = Hash.new({code: 200, response_guids: [iso_seg1.guid]})
->>>>>>> 2f67f926f (more keyword argument fixes)
           h['admin'] = { code: 200, response_guids: [iso_seg1.guid, VCAP::CloudController::IsolationSegmentModel::SHARED_ISOLATION_SEGMENT_GUID] }
           h['admin_read_only'] = { code: 200, response_guids: [iso_seg1.guid, VCAP::CloudController::IsolationSegmentModel::SHARED_ISOLATION_SEGMENT_GUID] }
           h['global_auditor'] = { code: 200, response_guids: [iso_seg1.guid, VCAP::CloudController::IsolationSegmentModel::SHARED_ISOLATION_SEGMENT_GUID] }

spec/request/jobs_spec.rb

@@ -167,11 +167,7 @@ def display_name
 
     context 'when the user has a global scope or a local role' do
       let(:api_call) { ->(user_headers) { get "/v3/jobs/#{job.guid}", nil, user_headers } }
-<<<<<<< HEAD
       let(:expected_codes_and_responses) { Hash.new({ code: 200 }.freeze) }
-=======
-      let(:expected_codes_and_responses) { Hash.new({code: 200}) }
->>>>>>> 2f67f926f (more keyword argument fixes)
 
       before do
         space.organization.add_user(user)

spec/request/route_destinations_spec.rb

@@ -157,17 +157,10 @@
 
     context 'when the user is a member in the routes org' do
       let(:expected_codes_and_responses) do
-<<<<<<< HEAD
         h = Hash.new(
           { code: 200,
             response_object: response_json }.freeze
         )
-=======
-        h = Hash.new({
-          code: 200,
-          response_object: response_json
-        })
->>>>>>> 2f67f926f (more keyword argument fixes)
 
         h['org_billing_manager'] = { code: 404 }
         h['no_role'] = { code: 404 }
@@ -298,11 +291,7 @@
       end
 
       let(:expected_codes_and_responses) do
-<<<<<<< HEAD
         h = Hash.new({ code: 403, errors: CF_NOT_AUTHORIZED }.freeze)
-=======
-        h = Hash.new({code: 403, errors: CF_NOT_AUTHORIZED})
->>>>>>> 2f67f926f (more keyword argument fixes)
         h['admin'] = { code: 200, response_object: response_json }
         h['space_developer'] = { code: 200, response_object: response_json }
         h['space_supporter'] = { code: 200, response_object: response_json }
@@ -812,11 +801,7 @@
         }
       end
       let(:expected_codes_and_responses) do
-<<<<<<< HEAD
         h = Hash.new({ code: 403, errors: CF_NOT_AUTHORIZED }.freeze)
-=======
-        h = Hash.new({code: 403, errors: CF_NOT_AUTHORIZED})
->>>>>>> 2f67f926f (more keyword argument fixes)
         h['admin'] = { code: 200, response_object: response_json }
         h['space_developer'] = { code: 200, response_object: response_json }
         h['space_supporter'] = { code: 200, response_object: response_json }
@@ -1259,11 +1244,7 @@
       end
 
       let(:expected_codes_and_responses) do
-<<<<<<< HEAD
         h = Hash.new({ code: 403, errors: CF_NOT_AUTHORIZED }.freeze)
-=======
-        h = Hash.new({code: 403, errors: CF_NOT_AUTHORIZED})
->>>>>>> 2f67f926f (more keyword argument fixes)
         h['admin'] = { code: 200 }
         h['space_developer'] = { code: 200 }
         h['space_supporter'] = { code: 200 }
@@ -1386,11 +1367,7 @@
       end
 
       let(:expected_codes_and_responses) do
-<<<<<<< HEAD
         h = Hash.new({ code: 403, errors: CF_NOT_AUTHORIZED }.freeze)
-=======
-        h = Hash.new({code: 403, errors: CF_NOT_AUTHORIZED})
->>>>>>> 2f67f926f (more keyword argument fixes)
         h['admin'] = { code: 204 }
         h['space_developer'] = { code: 204 }
         h['space_supporter'] = { code: 204 }

spec/request/routes_spec.rb

@@ -2695,7 +2695,6 @@
     describe 'permissions' do
       it_behaves_like 'permissions for single object endpoint', ALL_PERMISSIONS do
         let(:expected_codes_and_responses) do
-<<<<<<< HEAD
           h = Hash.new({ code: 200, response_object: {
             data: [
               {
@@ -2706,18 +2705,6 @@
               self: { href: %r{#{Regexp.escape(link_prefix)}/v3/routes/#{route.guid}/relationships/shared_spaces} }
             }
           } }.freeze)
-=======
-          h = Hash.new({code: 200, response_object: {
-                         data: [
-                           {
-                             guid: target_space_1.guid
-                           }
-                         ],
-                         links: {
-                           self: { href: %r{#{Regexp.escape(link_prefix)}/v3/routes/#{route.guid}/relationships/shared_spaces} }
-                         }
-                       }})
->>>>>>> 2f67f926f (more keyword argument fixes)
 
           h['org_billing_manager'] = { code: 404 }
           h['no_role'] = { code: 404 }