spec/gaffe/errors_spec.rb in gaffe-1.0.2 vs spec/gaffe/errors_spec.rb in gaffe-1.1.0

@@ -1,20 +1,23 @@
 require 'spec_helper'
 
 describe Gaffe::Errors do
   describe :Actions do
     describe :show do
-      let(:request) { ActionDispatch::TestRequest.new }
+      let(:request) { test_request }
       let(:env) { request.env.merge 'action_dispatch.exception' => exception }
+      let(:status) { response.first }
+      let(:body) { response.last.body }
 
-      let(:response) { Gaffe.errors_controller_for_request(env).action(:show).call(env) }
-      subject { response.last }
+      let(:response) do
+        Gaffe.errors_controller_for_request(env).action(:show).call(env)
+      end
 
       context 'with builtin exception' do
         let(:exception) { ActionController::RoutingError.new(:foo) }
-        its(:status) { should eql 404 }
-        its(:body) { should match(/Not Found/) }
+        it { expect(status).to eql 404 }
+        it { expect(body).to match(/Not Found/) }
       end
 
       context 'with custom exception and missing view' do
         before { ActionDispatch::ExceptionWrapper.rescue_responses.merge! exception_class.name => 'my_custom_error' }
 
@@ -22,11 +25,11 @@
           Object.instance_eval { remove_const :MyCustomError } if Object.const_defined?(:MyCustomError)
           MyCustomError = Class.new(StandardError)
         end
 
         let(:exception) { exception_class.new }
-        its(:status) { should eql 500 }
-        its(:body) { should match(/Internal Server Error/) }
+        it { expect(status).to eql 500 }
+        it { expect(body).to match(/Internal Server Error/) }
       end
     end
   end
 end