diff --git a/app/controllers/profile_admin/enterprise_validation_controller.rb b/app/controllers/profile_admin/enterprise_validation_controller.rb index 36ddd50..8b66296 100644 --- a/app/controllers/profile_admin/enterprise_validation_controller.rb +++ b/app/controllers/profile_admin/enterprise_validation_controller.rb @@ -5,7 +5,7 @@ class EnterpriseValidationController < ProfileAdminController end def details - @pending = profile.pending_validations(:code => params[:id]).first + @pending = profile.find_pending_validation(params[:id]) unless @pending render_not_found end diff --git a/test/functional/enterprise_validation_test.rb b/test/functional/enterprise_validation_test.rb index e41ac30..1b6cca3 100644 --- a/test/functional/enterprise_validation_test.rb +++ b/test/functional/enterprise_validation_test.rb @@ -28,14 +28,14 @@ all_fixtures should 'display details and prompt for needed data when approving or rejecting enterprise' do validating = CreateEnterprise.new - @org.expects(:pending_validations).with(:code => 'kakakaka').returns([validating]) + @org.expects(:find_pending_validation).with('kakakaka').returns(validating) get :details, :profile => 'myorg', :id => 'kakakaka' assert_same validating, assigns(:pending) end should 'refuse to validate unexisting request' do - @org.expects(:pending_validations).with(:code => 'kakakaka').returns([]) + @org.expects(:find_pending_validation).with('kakakaka').returns(nil) get :details , :profile => 'myorg', :id => 'kakakaka' assert_response 404 end -- libgit2 0.21.2