@@ -118,119 +118,7 @@ module Jobs
118118
119119 subject ( :job ) { SpaceApplyManifestActionJob . new ( space , app_guid_message_hash , apply_manifest_action , user_audit_info ) }
120120
121- let ( :serialized_job_rails_7 ) do
122- <<~EOS
123- --- !ruby/object:VCAP::CloudController::Jobs::LoggingContextJob
124- handler: !ruby/object:VCAP::CloudController::Jobs::TimeoutJob
125- handler: !ruby/object:VCAP::CloudController::Jobs::SpaceApplyManifestActionJob
126- space: !ruby/object:VCAP::CloudController::Space
127- values:
128- :id: #{ space . id }
129- :guid: space-guid
130- :created_at: #{ space . created_at . strftime ( '%F %H:%M:%S.%9N Z' ) }
131- :updated_at: #{ space . updated_at . strftime ( '%F %H:%M:%S.%9N Z' ) }
132- :name: space-name
133- :organization_id: #{ org . id }
134- :space_quota_definition_id:#{ ' ' }
135- :allow_ssh: true
136- :isolation_segment_guid:#{ ' ' }
137- app_guid_message_hash:
138- app-guid: &1 !ruby/object:VCAP::CloudController::AppManifestMessage
139- requested_keys:
140- - :name
141- - :instances
142- - :routes
143- - :buildpack
144- - :stack
145- extra_keys: []
146- buildpack: ruby
147- instances: 4
148- name: app-name
149- routes:
150- - :route: app.bommel
151- stack: cflinuxfs4
152- original_yaml:
153- :name: app-name
154- :instances: 4
155- :routes:
156- - :route: app.bommel
157- :buildpack: ruby
158- :stack: cflinuxfs4
159- validation_context:#{ ' ' }
160- errors: !ruby/object:ActiveModel::Errors
161- base: *1
162- errors: []
163- manifest_process_scale_messages:
164- - &2 !ruby/object:VCAP::CloudController::ManifestProcessScaleMessage
165- requested_keys:
166- - :instances
167- - :type
168- extra_keys: []
169- instances: 4
170- type: web
171- validation_context:#{ ' ' }
172- errors: !ruby/object:ActiveModel::Errors
173- base: *2
174- errors: []
175- manifest_process_update_messages: []
176- app_update_message: &3 !ruby/object:VCAP::CloudController::AppUpdateMessage
177- requested_keys:
178- - :lifecycle
179- extra_keys: []
180- lifecycle:
181- :data:
182- :buildpacks:
183- - ruby
184- :stack: cflinuxfs4
185- validation_context:#{ ' ' }
186- errors: !ruby/object:ActiveModel::Errors
187- base: *3
188- errors: []
189- manifest_buildpack_message: &4 !ruby/object:VCAP::CloudController::ManifestBuildpackMessage
190- requested_keys:
191- - :buildpack
192- extra_keys: []
193- buildpack: ruby
194- validation_context:#{ ' ' }
195- errors: !ruby/object:ActiveModel::Errors
196- base: *4
197- errors: []
198- manifest_routes_update_message: &5 !ruby/object:VCAP::CloudController::ManifestRoutesUpdateMessage
199- requested_keys:
200- - :routes
201- extra_keys: []
202- routes:
203- - :route: app.bommel
204- validation_context:#{ ' ' }
205- errors: !ruby/object:ActiveModel::Errors
206- base: *5
207- errors: []
208- manifest_route_mappings:
209- - :route: !ruby/object:VCAP::CloudController::ManifestRoute
210- attrs:
211- :scheme: unspecified
212- :user:#{ ' ' }
213- :password:#{ ' ' }
214- :host: app.bommel
215- :port:#{ ' ' }
216- :path: ''
217- :query:#{ ' ' }
218- :fragment:#{ ' ' }
219- :full_route: app.bommel
220- :options: {}
221- :protocol:#{ ' ' }
222- apply_manifest_action: !ruby/object:VCAP::CloudController::AppApplyManifest
223- user_audit_info: &6 !ruby/object:VCAP::CloudController::UserAuditInfo
224- 225- user_name: user-name
226- user_guid: user-guid
227- user_audit_info: *6
228- timeout: 14400
229- request_id:#{ ' ' }
230- EOS
231- end
232-
233- let ( :serialized_job_rails_8 ) do
121+ let ( :serialized_job ) do
234122 <<~EOS
235123 --- !ruby/object:VCAP::CloudController::Jobs::LoggingContextJob
236124 handler: !ruby/object:VCAP::CloudController::Jobs::TimeoutJob
@@ -357,15 +245,12 @@ module Jobs
357245 ManifestBuildpackMessage , AppUpdateMessage , ManifestProcessScaleMessage , AppManifestMessage , Space , SpaceApplyManifestActionJob , TimeoutJob ,
358246 LoggingContextJob ]
359247 db_job = YAML . safe_load ( jobs_in_db [ 0 ] [ :handler ] , permitted_classes : permitted_classes , aliases : true ) . as_json
360- dumped_job = YAML . safe_load ( Rails :: VERSION :: MAJOR >= 8 ? serialized_job_rails_8 : serialized_job_rails_7 , permitted_classes : permitted_classes , aliases : true ) . as_json
248+ dumped_job = YAML . safe_load ( serialized_job , permitted_classes : permitted_classes , aliases : true ) . as_json
361249 expect ( db_job ) . to eq ( dumped_job )
362250 end
363251
364252 it 'can be deserialized' do
365- object = YAML . load_dj ( serialized_job_rails_7 )
366- expect ( object ) . not_to be_nil
367-
368- object = YAML . load_dj ( serialized_job_rails_8 )
253+ object = YAML . load_dj ( serialized_job )
369254 expect ( object ) . not_to be_nil
370255 end
371256 end
![dependabot[bot]](https://avatars.githubusercontent.com/in/29110?v=4&size=40){kind=avatar}
0 commit comments