diff options
| -rw-r--r-- | app/models/info_request.rb | 8 | ||||
| -rw-r--r-- | spec/models/info_request_spec.rb | 29 |
2 files changed, 3 insertions, 34 deletions
diff --git a/app/models/info_request.rb b/app/models/info_request.rb index bc7247806..c12d364b6 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -23,7 +23,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: info_request.rb,v 1.181 2009-04-06 10:58:03 louise Exp $ +# $Id: info_request.rb,v 1.182 2009-04-06 16:28:44 louise Exp $ require 'digest/sha1' require File.join(File.dirname(__FILE__),'../../vendor/plugins/acts_as_xapian/lib/acts_as_xapian') @@ -716,11 +716,7 @@ public def is_owning_user?(user) !user.nil? && (user.id == user_id || user.owns_every_request?) end - - def is_real_owning_user?(user) - !user.nil? && (user.id == user_id) - end - + end diff --git a/spec/models/info_request_spec.rb b/spec/models/info_request_spec.rb index 299a9656e..7e87d0900 100644 --- a/spec/models/info_request_spec.rb +++ b/spec/models/info_request_spec.rb @@ -152,34 +152,7 @@ describe InfoRequest do end - describe 'when asked if a user is the real owner of this request' do - - before do - @mock_user = mock_model(User) - @info_request = InfoRequest.new(:user => @mock_user) - @other_mock_user = mock_model(User) - end - - it 'should return false if a nil object is passed to it' do - @info_request.is_real_owning_user?(nil).should be_false - end - - it 'should return true if the user is the request\'s owner' do - @info_request.is_real_owning_user?(@mock_user).should be_true - end - - it 'should return false for a user that is not the owner and does not own every request' do - @other_mock_user.stub!(:owns_every_request?).and_return(false) - @info_request.is_real_owning_user?(@other_mock_user).should be_false - end - - it 'should return false if the user is not the owner but owns every request' do - @other_mock_user.stub!(:owns_every_request?).and_return(true) - @info_request.is_real_owning_user?(@other_mock_user).should be_false - end - - end - + describe 'when asked if it requires admin' do before do |