diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-08-22 17:34:51 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-08-22 17:34:51 +0100 |
| commit | e98bfd6e9ed7e6bb151d0eb5c216cad0fed6a40c (patch) | |
| tree | 222e151cf7ee87a06824553b2b53b2053c8f10a4 /spec/views | |
| parent | da70b7b4f58be9d78afba9ec6045d18094ea9581 (diff) | |
| parent | bc73110b230e607d4d7e5acae467790845784704 (diff) | |
Merge branch 'release/0.6.3'0.6.3
Diffstat (limited to 'spec/views')
| -rw-r--r-- | spec/views/request/_after_actions.rhtml_spec.rb | 2 | ||||
| -rw-r--r-- | spec/views/request/_describe_state.rhtml_spec.rb | 7 | ||||
| -rw-r--r-- | spec/views/request/show.rhtml_spec.rb | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/spec/views/request/_after_actions.rhtml_spec.rb b/spec/views/request/_after_actions.rhtml_spec.rb index 6a56e7a71..d04db3fc2 100644 --- a/spec/views/request/_after_actions.rhtml_spec.rb +++ b/spec/views/request/_after_actions.rhtml_spec.rb @@ -9,6 +9,8 @@ describe 'when displaying actions that can be taken with regard to a request' do :url_name => 'test_user') @mock_request = mock_model(InfoRequest, :title => 'test request', :user => @mock_user, + :user_name => @mock_user.name, + :is_external? => false, :public_body => @mock_body, :url_title => 'test_request') assigns[:info_request] = @mock_request diff --git a/spec/views/request/_describe_state.rhtml_spec.rb b/spec/views/request/_describe_state.rhtml_spec.rb index ccf653b1b..18778d5d2 100644 --- a/spec/views/request/_describe_state.rhtml_spec.rb +++ b/spec/views/request/_describe_state.rhtml_spec.rb @@ -18,7 +18,12 @@ describe 'when showing the form for describing the state of a request' do before do @mock_user = mock_model(User, :name => 'test user', :url_name => 'test_user') - @mock_request = mock_model(InfoRequest, :described_state => '', :user => @mock_user) + @mock_request = mock_model(InfoRequest, + :described_state => '', + :user => @mock_user, + :user_name => @mock_user.name, + :is_external? => false + ) assigns[:info_request] = @mock_request end diff --git a/spec/views/request/show.rhtml_spec.rb b/spec/views/request/show.rhtml_spec.rb index ef7d1a47c..4429e9e58 100644 --- a/spec/views/request/show.rhtml_spec.rb +++ b/spec/views/request/show.rhtml_spec.rb @@ -15,6 +15,8 @@ describe 'when viewing an information request' do :law_used_full => 'Freedom of Information', :public_body => @mock_body, :user => @mock_user, + :user_name => @mock_user.name, + :is_external? => false, :calculate_status => 'waiting_response', :date_response_required_by => Date.today, :prominence => 'normal') |