add test for PATCH

Author: kathap

app/controllers/v3/service_instances_controller.rb

@@ -415,7 +415,7 @@ def raise_if_invalid_service_plan!(service_instance, message)
     service_plan = ServicePlan.first(guid: message.service_plan_guid)
     unprocessable_service_plan! unless service_plan_valid?(service_plan)
     unavailable_service_plan!(service_plan) unless service_plan_active?(service_plan)
-    service_plan_not_visible_in_space!(service_plan, space) unless service_plan_exists_in_space?(service_plan, service_instance.space)
+    service_plan_not_visible_in_space!(service_plan, service_instance.space) unless service_plan_exists_in_space?(service_plan, service_instance.space)
     invalid_service_plan_relation! unless service_plan.service == service_instance.service
   end
 
@@ -442,7 +442,7 @@ def unavailable_service_plan!(service_plan)
 
   def service_plan_not_visible_in_space!(service_plan, space)
     unprocessable!('Invalid service plan. This could be due to a space-scoped broker which is offering the service plan ' \
-                   "'#{service_plan.name}' with guid '#{service_plan.guid} in another space or that the plan " \
+                   "'#{service_plan.name}' with guid '#{service_plan.guid}' in another space or that the plan " \
                    'is not enabled in this organization. Ensure that the service plan is visible in your current space ' \
                    "'#{space.name}' with guid '#{space.guid}'.")
   end

spec/request/service_instances_spec.rb

@@ -1261,7 +1261,7 @@ def check_filtered_instances(*instances)
             expect(parsed_response['errors']).to include(
               include({
                         'detail' => 'Invalid service plan. This could be due to a space-scoped broker which is offering the service plan ' \
-                                    "'#{service_plan.name}' with guid '#{service_plan.guid} in another space or that the plan " \
+                                    "'#{service_plan.name}' with guid '#{service_plan.guid}' in another space or that the plan " \
                                     'is not enabled in this organization. Ensure that the service plan is visible in your current space ' \
                                     "'#{space.name}' with guid '#{space.guid}'.",
                         'title' => 'CF-UnprocessableEntity',
@@ -2409,6 +2409,26 @@ def check_filtered_instances(*instances)
           end
         end
 
+        context 'not enabled in that org' do
+          let(:service_plan) { VCAP::CloudController::ServicePlan.make(public: false, active: true) }
+          let(:service_plan_guid) { service_plan.guid }
+
+          it 'fails saying the plan is invalid' do
+            api_call.call(admin_headers)
+            expect(last_response).to have_status_code(422)
+            expect(parsed_response['errors']).to include(
+              include({
+                        'detail' => 'Invalid service plan. This could be due to a space-scoped broker which is offering the service plan ' \
+                                    "'#{service_plan.name}' with guid '#{service_plan.guid}' in another space or that the plan " \
+                                    'is not enabled in this organization. Ensure that the service plan is visible in your current space ' \
+                                    "'#{space.name}' with guid '#{space.guid}'.",
+                        'title' => 'CF-UnprocessableEntity',
+                        'code' => 10_008
+                      })
+            )
+          end
+        end
+
         context 'not available' do
           let(:service_plan) { VCAP::CloudController::ServicePlan.make(public: true, active: false) }
           let(:service_plan_guid) { service_plan.guid }