diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2012-06-27 14:15:09 +0100 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2012-06-27 14:15:09 +0100 |
| commit | af24b1e306dab3ebe10d97f7777abedd011321da (patch) | |
| tree | b440b839bf1e7465ab154cdc19ee9366b9f98198 /spec/views | |
| parent | 6c4c822ef7a4491bf821326af779e5be9118c0a1 (diff) | |
| parent | 5b80d1b9a0933b1e20de013d1aa8b8522f2ad066 (diff) | |
Merge branch 'release/0.6.1'0.6.1
Diffstat (limited to 'spec/views')
| -rw-r--r-- | spec/views/public_body/show.rhtml_spec.rb | 5 | ||||
| -rw-r--r-- | spec/views/request/list.rhtml_spec.rb | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/spec/views/public_body/show.rhtml_spec.rb b/spec/views/public_body/show.rhtml_spec.rb index a37d8be0d..1d21f80c4 100644 --- a/spec/views/public_body/show.rhtml_spec.rb +++ b/spec/views/public_body/show.rhtml_spec.rb @@ -102,9 +102,10 @@ def mock_event :info_request => mock_model(InfoRequest, :title => 'Title', :url_title => 'title', - :display_status => 'awaiting_response', - :calculate_status => 'awaiting_response', + :display_status => 'waiting_response', + :calculate_status => 'waiting_response', :public_body => @pb, + :is_external? => false, :user => mock_model(User, :name => 'Test User', :url_name => 'testuser') ), :incoming_message => nil, :is_incoming_message? => false, diff --git a/spec/views/request/list.rhtml_spec.rb b/spec/views/request/list.rhtml_spec.rb index c7067294f..94ece5e76 100644 --- a/spec/views/request/list.rhtml_spec.rb +++ b/spec/views/request/list.rhtml_spec.rb @@ -19,7 +19,8 @@ describe "when listing recent requests" do :display_status => 'awaiting_response', :calculate_status => 'awaiting_response', :public_body => mock_model(PublicBody, :name => 'Test Quango', :url_name => 'testquango'), - :user => mock_model(User, :name => 'Test User', :url_name => 'testuser') + :user => mock_model(User, :name => 'Test User', :url_name => 'testuser'), + :is_external? => false ), :incoming_message => nil, :is_incoming_message? => false, :outgoing_message => nil, :is_outgoing_message? => false, |