diff options
| -rw-r--r-- | spec/views/request/_after_actions.rhtml_spec.rb | 55 |
1 files changed, 20 insertions, 35 deletions
diff --git a/spec/views/request/_after_actions.rhtml_spec.rb b/spec/views/request/_after_actions.rhtml_spec.rb index b1a8a5748..54fef8cab 100644 --- a/spec/views/request/_after_actions.rhtml_spec.rb +++ b/spec/views/request/_after_actions.rhtml_spec.rb @@ -17,36 +17,6 @@ describe 'when displaying actions that can be taken with regard to a request' do assign :info_request, @mock_request end - def do_render - render :partial => 'request/after_actions' - end - - def expect_owner_div - do_render - response.should have_selector('div#owner_actions'){ yield } - end - - def expect_anyone_div - do_render - response.should have_selector('div#anyone_actions'){ yield } - end - - def expect_owner_link(text) - expect_owner_div{ with_tag('a', :content => text) } - end - - def expect_no_owner_link(text) - expect_owner_div{ without_tag('a', :content => text) } - end - - def expect_anyone_link(text) - expect_anyone_div{ with_tag('a', :content => text) } - end - - def expect_no_anyone_link(text) - expect_anyone_div{ without_tag('a', :content => text) } - end - describe 'if the request is old and unclassified' do before do @@ -54,11 +24,17 @@ describe 'when displaying actions that can be taken with regard to a request' do end it 'should not display a link for the request owner to update the status of the request' do - expect_no_owner_link('Update the status of this request') + render :partial => 'request/after_actions' + response.should have_selector('div#owner_actions') do |div| + div.should_not have_selector('a', :content => 'Update the status of this request') + end end it 'should display a link for anyone to update the status of the request' do - expect_anyone_link('Update the status of this request') + render :partial => 'request/after_actions' + response.should have_selector('div#anyone_actions') do |div| + div.should have_selector('a', :content => 'Update the status of this request') + end end end @@ -70,17 +46,26 @@ describe 'when displaying actions that can be taken with regard to a request' do end it 'should display a link for the request owner to update the status of the request' do - expect_owner_link('Update the status of this request') + render :partial => 'request/after_actions' + response.should have_selector('div#owner_actions') do |div| + div.should have_selector('a', :content => 'Update the status of this request') + end end it 'should not display a link for anyone to update the status of the request' do - expect_no_anyone_link('Update the status of this request') + render :partial => 'request/after_actions' + response.should have_selector('div#anyone_actions') do |div| + div.should_not have_selector('a', :content => 'Update the status of this request') + end end end it 'should display a link for the request owner to request a review' do - expect_owner_link('Request an internal review') + render :partial => 'request/after_actions' + response.should have_selector('div#owner_actions') do |div| + div.should have_selector('a', :content => 'Request an internal review') + end end end |