1 files changed, 15 insertions, 34 deletions
diff --git a/spec/views/request/show.rhtml_spec.rb b/spec/views/request/show.rhtml_spec.rb
index 4429e9e58..cc5226847 100644
--- a/spec/views/request/show.rhtml_spec.rb
+++ b/spec/views/request/show.rhtml_spec.rb
@@ -23,32 +23,23 @@ describe 'when viewing an information request' do
     end
     
     def request_page
-        assigns[:info_request] = @mock_request
-        assigns[:info_request_events] = []
-        assigns[:status] = @mock_request.calculate_status
-        template.stub!(:render_partial)
-        render 'request/show'
-    end
-    
-    it 'should show the sidebar' do 
-        template.should_receive(:render_partial).with(:partial => 'sidebar', :locals => {})
-        request_page
-    end
-    
-    it 'should show the actions people can take' do
-        template.should_receive(:render_partial).with(:partial => 'after_actions', :locals => {})
-        request_page
+        assign :info_request, @mock_request
+        assign :info_request_events, []
+        assign :status, @mock_request.calculate_status
+        # This is so icky!
+        view.stub!(:_render_partial)
+        render :template => 'request/show'
     end
     
     describe 'when a status update has been requested' do 
         
         before do 
-            assigns[:update_status] = true
+            assign :update_status, true
         end
         
         it 'should show the first form for describing the state of the request' do
             request_page
-            response.should have_tag("div.describe_state_form#describe_state_form_1")
+            response.should have_selector("div.describe_state_form#describe_state_form_1")
         end    
         
     end
@@ -61,12 +52,12 @@ describe 'when viewing an information request' do
         
         it 'should show the first form for describing the state of the request' do
             request_page
-            response.should have_tag("div.describe_state_form#describe_state_form_1")
+            response.should have_selector("div.describe_state_form#describe_state_form_1")
         end
         
         it 'should show the second form for describing the state of the request' do 
             request_page
-            response.should have_tag("div.describe_state_form#describe_state_form_2")
+            response.should have_selector("div.describe_state_form#describe_state_form_2")
         end
     
     end
@@ -74,7 +65,7 @@ describe 'when viewing an information request' do
     describe 'when the user is the request owner' do 
     
         before do 
-            assigns[:is_owning_user] = true
+            assign :is_owning_user, true
         end
         
         describe 'when the request status is "waiting clarification"' do 
@@ -88,18 +79,13 @@ describe 'when viewing an information request' do
                 before do
                     @mock_response = mock_model(IncomingMessage)
                     @mock_request.stub!(:get_last_response).and_return(@mock_response)
-                    @old_filters = ActionController::Routing::Routes.filters
-                    ActionController::Routing::Routes.filters = RoutingFilter::Chain.new
-                end
-                after do
-                    ActionController::Routing::Routes.filters = @old_filters
                 end
 
             
                 it 'should show a link to follow up the last response with clarification' do 
                     request_page
-                    expected_url = "http://test.host/request/#{@mock_request.id}/response/#{@mock_response.id}#followup"
-                    response.should have_tag("a[href=#{expected_url}]", :text => 'send a follow up message')
+                    expected_url = "http://test.host/en/request/#{@mock_request.id}/response/#{@mock_response.id}#followup"
+                    response.should have_selector("a", :href => expected_url, :content => 'send a follow up message')
                 end
             
             end
@@ -108,18 +94,13 @@ describe 'when viewing an information request' do
         
                 before do 
                     @mock_request.stub!(:get_last_response).and_return(nil)
-                    @old_filters = ActionController::Routing::Routes.filters
-                    ActionController::Routing::Routes.filters = RoutingFilter::Chain.new
-                end
-                after do
-                    ActionController::Routing::Routes.filters = @old_filters
                 end
 
             
                 it 'should show a link to follow up the request without reference to a specific response' do 
                     request_page
-                    expected_url = "http://test.host/request/#{@mock_request.id}/response#followup"
-                    response.should have_tag("a[href=#{expected_url}]", :text => 'send a follow up message')
+                    expected_url = "http://test.host/en/request/#{@mock_request.id}/response#followup"
+                    response.should have_selector("a", :href => expected_url, :content => 'send a follow up message')
                 end
             end
         end