diff --git a/app/models/runtime/process_model.rb b/app/models/runtime/process_model.rb index dad1d517ab..80ecffa2be 100644 --- a/app/models/runtime/process_model.rb +++ b/app/models/runtime/process_model.rb @@ -385,7 +385,7 @@ def started_command def run_action_user return user if user.present? - docker? ? docker_run_action_user : AppModel::DEFAULT_CONTAINER_USER + app&.docker? ? docker_run_action_user : AppModel::DEFAULT_CONTAINER_USER end def specified_or_detected_command diff --git a/spec/unit/models/runtime/process_model_spec.rb b/spec/unit/models/runtime/process_model_spec.rb index 8b8d0be3bd..565e7548fd 100644 --- a/spec/unit/models/runtime/process_model_spec.rb +++ b/spec/unit/models/runtime/process_model_spec.rb @@ -747,6 +747,17 @@ def act_as_cf_admin end end end + + context 'when the associated app is nil' do + before do + process.app = nil + end + + it 'does not raise an error and returns nil' do + expect { process.run_action_user }.not_to raise_error + expect(process.run_action_user).to eq('vcap') + end + end end describe '#specified_or_detected_command' do