diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-11-12 15:06:46 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-11-12 15:06:46 +0000 |
| commit | a1ca0f9123a3aea843ba35508a97d5a4fd5cb0db (patch) | |
| tree | b9d3c1390f6b9c8b201e47507f26829b239f2773 /spec/models/info_request_spec.rb | |
| parent | 8271b2c664f04d1b68a8b4d4fdb801f5c6b00b8c (diff) | |
| parent | c96b27c301023a6a1f50c12f0c387205b0255836 (diff) | |
Merge remote-tracking branch 'origin/release/0.6.8'0.6.8
Conflicts:
locale/cs/app.po
locale/sl/app.po
locale/sq/app.po
locale/tr/app.po
locale/uk/app.po
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 204c600d9..2aeac2fec 100644 --- a/spec/models/info_request_spec.rb +++ b/spec/models/info_request_spec.rb @@ -441,16 +441,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') |