various test fixes, mostly to do with spacing

Author: sethboyles

spec/request/app_features_spec.rb

@@ -165,7 +165,7 @@
         h = Hash.new({ code: 403, errors: CF_NOT_AUTHORIZED }.freeze)
 
         %w[no_role org_auditor org_billing_manager].each { |r| h[r] = { code: 404 } }
-        %w[admin space_devµeloper].each { |r| h[r] = { code: 200, response_object: feature_response_object } }
+        %w[admin space_developer].each { |r| h[r] = { code: 200, response_object: feature_response_object } }
         h
       end
 

spec/unit/controllers/v3/sidecars_controller_spec.rb

@@ -30,7 +30,7 @@
       it 'fails to map a route' do
         expect do
           get :index_by_process
-        end.to raise_error(ActionController::UrlGenerationError, /No route matches \{:action=>"index_by_process", :controller=>"sidecars"\}/)
+        end.to raise_error(ActionController::UrlGenerationError, /No route matches \{action: "index_by_process", controller: "sidecars"\}/)
       end
     end
 

spec/unit/lib/cloud_controller/config_spec.rb

@@ -155,7 +155,7 @@ module VCAP::CloudController
               it "can't handle an unescaped @" do
                 expect do
                   DatabasePartsParser.database_parts_from_connection(uri)
-                end.to raise_error(URI::InvalidURIError, "bad URI(is not URI?): \"#{uri}\"")
+                end.to raise_error(URI::InvalidURIError, "bad URI (is not URI?): \"#{uri}\"")
               end
             end
 

spec/unit/lib/cloud_controller/database_parts_parser_spec.rb

@@ -40,7 +40,7 @@
         uri = 'mysql://user:p4s [email protected]:1234/databasename'
         expect do
           VCAP::CloudController::DatabasePartsParser.database_parts_from_connection(uri)
-        end.to raise_error(URI::InvalidURIError, "bad URI(is not URI?): \"#{uri}\"")
+        end.to raise_error(URI::InvalidURIError, "bad URI (is not URI?): \"#{uri}\"")
       end
     end
   end

spec/unit/lib/services/service_brokers/v2/http_client_spec.rb

@@ -83,11 +83,11 @@ module VCAP::Services::ServiceBrokers::V2
       it 'logs the default headers' do
         make_request
         expect(fake_logger).to have_received(:debug).with(match(%r{Accept" => "application/json}))
-        expect(fake_logger).to have_received(:debug).with(match(/X-VCAP-Request-ID"=>"[[:alnum:]-]+/))
-        expect(fake_logger).to have_received(:debug).with(match(/X-Broker-API-Request-Identity"=>"[[:alnum:]-]+/))
-        expect(fake_logger).to have_received(:debug).with(match(/X-Broker-Api-Version"=>"2\.15/))
+        expect(fake_logger).to have_received(:debug).with(match(/X-VCAP-Request-ID" => "[[:alnum:]-]+/))
+        expect(fake_logger).to have_received(:debug).with(match(/X-Broker-API-Request-Identity" => "[[:alnum:]-]+/))
+        expect(fake_logger).to have_received(:debug).with(match(/X-Broker-Api-Version" => "2\.15/))
         api_info_path = TestConfig.config[:temporary_enable_v2] ? '/v2/info' : '/'
-        expect(fake_logger).to have_received(:debug).with(match(/X-Api-Info-Location"=>"api2\.vcap\.me#{api_info_path}/))
+        expect(fake_logger).to have_received(:debug).with(match(/X-Api-Info-Location" => "api2\.vcap\.me#{api_info_path}/))
       end
 
       context 'when an https URL is used' do
@@ -357,12 +357,12 @@ def expect_timeout_to_be(timeout)
 
       it 'redacts credentials from response body' do
         make_request
-        expect(fake_logger).to have_received(:debug).with(/"credentials"=>"\[REDACTED\]"/)
+        expect(fake_logger).to have_received(:debug).with(/"credentials" => "\[REDACTED\]"/)
       end
 
       it 'does not redact other keys' do
         make_request
-        expect(fake_logger).to have_received(:debug).with(%r{"syslog_drain_url"=>"example.com/1234"})
+        expect(fake_logger).to have_received(:debug).with(%r{"syslog_drain_url" => "example.com/1234"})
       end
 
       context 'non-json responses' do
@@ -507,7 +507,7 @@ def expect_timeout_to_be(timeout)
 
         it 'logs the Content-Type Header' do
           make_request
-          expect(fake_logger).to have_received(:debug).with(match(%r{"Content-Type"=>"application/json"}))
+          expect(fake_logger).to have_received(:debug).with(match(%r{"Content-Type" => "application/json"}))
         end
 
         it 'has a content body' do
@@ -584,7 +584,7 @@ def expect_timeout_to_be(timeout)
 
         it 'logs the Content-Type Header' do
           make_request
-          expect(fake_logger).to have_received(:debug).with(match(%r{"Content-Type"=>"application/json"}))
+          expect(fake_logger).to have_received(:debug).with(match(%r{"Content-Type" => "application/json"}))
         end
 
         it 'has a content body' do

spec/unit/presenters/error_presenter_spec.rb

@@ -39,7 +39,7 @@ def response_code
     let(:error) { StandardError.new }
 
     it 'logs the response code and unsanitized error hash' do
-      expect(presenter.log_message).to eq('Request failed: 500: {"fake"=>"insane"}')
+      expect(presenter.log_message).to eq('Request failed: 500: {"fake" => "insane"}')
     end
   end
 

spec/unit/support/matchers/be_a_response_like_spec.rb

@@ -70,13 +70,13 @@
   it 'fails when hash values within arrays do not match' do
     expect do
       expect({ 'a' => [{ 'b' => 1 }] }).to be_a_response_like({ 'a' => [{ 'b' => 2 }] })
-    end.to raise_expectation_not_met_with_key_change(expected: '- a[0]: {"b"=>2}', actual: '+ a[0]: {"b"=>1}')
+    end.to raise_expectation_not_met_with_key_change(expected: '- a[0]: {"b" => 2}', actual: '+ a[0]: {"b" => 1}')
   end
 
   it 'fails when hash keys within arrays do not match' do
     expect do
       expect({ 'a' => [{ 'b' => 1 }] }).to be_a_response_like({ 'a' => [{ 'c' => 1 }] })
-    end.to raise_expectation_not_met_with_key_change(expected: '- a[0]: {"c"=>1}', actual: '+ a[0]: {"b"=>1}')
+    end.to raise_expectation_not_met_with_key_change(expected: '- a[0]: {"c" => 1}', actual: '+ a[0]: {"b" => 1}')
   end
 
   it 'fails when actual is empty but expected is an empty array' do
@@ -88,14 +88,14 @@
   it 'fails when actual as a non-empty but expected is an empty array' do
     expect do
       expect({ 'a' => [{ 'b' => 1 }] }).to be_a_response_like({ 'a' => [] })
-    end.to raise_expectation_not_met_with_summary(/\+ a\[0\]: \{"b"=>1\}/)
+    end.to raise_expectation_not_met_with_summary(/\+ a\[0\]: \{"b" => 1\}/)
   end
 
   it 'fails on deeply nested value mismatches' do
     expect do
       expect({ 'a' => [{ 'a' => { 'a' => [{ 'a' => 1 }, { 'b' => 2 }] } }] }).to be_a_response_like({ 'a' => [{ 'a' => { 'a' => [{ 'a' => 1 }, { 'b' => 1 }] } }] })
-    end.to raise_expectation_not_met_with_key_change(expected: '- a[0].a.a[1]: {"b"=>1}',
-                                                     actual: '+ a[0].a.a[1]: {"b"=>2}')
+    end.to raise_expectation_not_met_with_key_change(expected: '- a[0].a.a[1]: {"b" => 1}',
+                                                     actual: '+ a[0].a.a[1]: {"b" => 2}')
   end
 
   def raise_expectation_not_met_with_summary(ptn)

spec/unit/support/matchers/match_json_response_spec.rb

@@ -70,13 +70,13 @@
   it 'fails when hash values within arrays do not match' do
     expect do
       expect({ 'a' => [{ 'b' => 1 }] }).to match_json_response({ a: [{ b: 2 }] })
-    end.to raise_expectation_not_met_with_key_change(expected: '- a[0]: {:b=>2}', actual: '+ a[0]: {:b=>1}')
+    end.to raise_expectation_not_met_with_key_change(expected: '- a[0]: {b: 2}', actual: '+ a[0]: {b: 1}')
   end
 
   it 'fails when hash keys within arrays do not match' do
     expect do
       expect({ 'a' => [{ 'b' => 1 }] }).to match_json_response({ a: [{ c: 1 }] })
-    end.to raise_expectation_not_met_with_key_change(expected: '- a[0]: {:c=>1}', actual: '+ a[0]: {:b=>1}')
+    end.to raise_expectation_not_met_with_key_change(expected: '- a[0]: {c: 1}', actual: '+ a[0]: {b: 1}')
   end
 
   it 'fails when actual is empty but expected is an empty array' do
@@ -88,14 +88,14 @@
   it 'fails when actual as a non-empty but expected is an empty array' do
     expect do
       expect({ 'a' => [{ 'b' => 1 }] }).to match_json_response({ a: [] })
-    end.to raise_expectation_not_met_with_summary(/\+ a\[0\]: \{:b=>1\}/)
+    end.to raise_expectation_not_met_with_summary(/\+ a\[0\]: \{b: 1\}/)
   end
 
   it 'fails on deeply nested value mismatches' do
     expect do
       expect({ 'a' => [{ 'a' => { 'a' => [{ 'a' => 1 }, { 'b' => 2 }] } }] }).to match_json_response({ a: [{ a: { a: [{ a: 1 }, { b: 1 }] } }] })
-    end.to raise_expectation_not_met_with_key_change(expected: '- a[0].a.a[1]: {:b=>1}',
-                                                     actual: '+ a[0].a.a[1]: {:b=>2}')
+    end.to raise_expectation_not_met_with_key_change(expected: '- a[0].a.a[1]: {b: 1}',
+                                                     actual: '+ a[0].a.a[1]: {b: 2}')
   end
 
   it 'outputs submatcher error message when it errors' do