diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-11-12 13:46:59 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-11-12 13:46:59 +0000 |
| commit | 8b4003f7fce9e089f2220e6f1a21681f7cf2df3d (patch) | |
| tree | 15333943091fc3ae79dedee46a6dd34ce3f1a1ec /spec/models/info_request_spec.rb | |
| parent | 646fffde374e575ab53cfae78e7a0c521cd90d6f (diff) | |
| parent | c96b27c301023a6a1f50c12f0c387205b0255836 (diff) | |
Merge remote-tracking branch 'origin/release/0.6.8' into wdtk
Conflicts:
config/general.yml-example
Diffstat (limited to 'spec/models/info_request_spec.rb')
| -rw-r--r-- | spec/models/info_request_spec.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/spec/models/info_request_spec.rb b/spec/models/info_request_spec.rb index f5c92e5f6..58d62f29c 100644 --- a/spec/models/info_request_spec.rb +++ b/spec/models/info_request_spec.rb @@ -468,16 +468,16 @@ describe InfoRequest do describe 'when applying censor rules' do before do - @global_rule = mock_model(CensorRule, :apply_to_text! => nil, + @global_rule = safe_mock_model(CensorRule, :apply_to_text! => nil, :apply_to_binary! => nil) - @user_rule = mock_model(CensorRule, :apply_to_text! => nil, + @user_rule = safe_mock_model(CensorRule, :apply_to_text! => nil, :apply_to_binary! => nil) - @request_rule = mock_model(CensorRule, :apply_to_text! => nil, + @request_rule = safe_mock_model(CensorRule, :apply_to_text! => nil, :apply_to_binary! => nil) - @body_rule = mock_model(CensorRule, :apply_to_text! => nil, + @body_rule = safe_mock_model(CensorRule, :apply_to_text! => nil, :apply_to_binary! => nil) - @user = mock_model(User, :censor_rules => [@user_rule]) - @body = mock_model(PublicBody, :censor_rules => [@body_rule]) + @user = safe_mock_model(User, :censor_rules => [@user_rule]) + @body = safe_mock_model(PublicBody, :censor_rules => [@body_rule]) @info_request = InfoRequest.new(:prominence => 'normal', :awaiting_description => true, :title => 'title') |