Commit db1140eeb5c93b8d7bfe5ebaad86c03f9924a0bc
1 parent
51f9397d
Exists in
master
and in
22 other branches
ActionItem16: changing the access to individual pending validation by code
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@865 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing
2 changed files
with
3 additions
and
3 deletions
Show diff stats
app/controllers/profile_admin/enterprise_validation_controller.rb
| ... | ... | @@ -5,7 +5,7 @@ class EnterpriseValidationController < ProfileAdminController |
| 5 | 5 | end |
| 6 | 6 | |
| 7 | 7 | def details |
| 8 | - @pending = profile.pending_validations(:code => params[:id]).first | |
| 8 | + @pending = profile.find_pending_validation(params[:id]) | |
| 9 | 9 | unless @pending |
| 10 | 10 | render_not_found |
| 11 | 11 | end | ... | ... |
test/functional/enterprise_validation_test.rb
| ... | ... | @@ -28,14 +28,14 @@ all_fixtures |
| 28 | 28 | |
| 29 | 29 | should 'display details and prompt for needed data when approving or rejecting enterprise' do |
| 30 | 30 | validating = CreateEnterprise.new |
| 31 | - @org.expects(:pending_validations).with(:code => 'kakakaka').returns([validating]) | |
| 31 | + @org.expects(:find_pending_validation).with('kakakaka').returns(validating) | |
| 32 | 32 | |
| 33 | 33 | get :details, :profile => 'myorg', :id => 'kakakaka' |
| 34 | 34 | assert_same validating, assigns(:pending) |
| 35 | 35 | end |
| 36 | 36 | |
| 37 | 37 | should 'refuse to validate unexisting request' do |
| 38 | - @org.expects(:pending_validations).with(:code => 'kakakaka').returns([]) | |
| 38 | + @org.expects(:find_pending_validation).with('kakakaka').returns(nil) | |
| 39 | 39 | get :details , :profile => 'myorg', :id => 'kakakaka' |
| 40 | 40 | assert_response 404 |
| 41 | 41 | end | ... | ... |