diff --git a/spec/faraday/deprecate_spec.rb b/spec/faraday/deprecate_spec.rb index 93247b4c0..a4a25c748 100644 --- a/spec/faraday/deprecate_spec.rb +++ b/spec/faraday/deprecate_spec.rb @@ -41,39 +41,19 @@ def initialize(foo = nil) end it 'allows rescuing of a current error with a deprecated error' do - begin - raise SampleClass, nil - rescue SampleDeprecatedClass - rescue StandardError => exc - fail "rescued #{exc.class.name} instead" - end + expect { raise SampleClass, nil }.to raise_error(SampleDeprecatedClass) end it 'allows rescuing of a current error with a current error' do - begin - raise SampleClass, nil - rescue SampleClass - rescue StandardError => exc - fail "rescued #{exc.class.name} instead" - end + expect { raise SampleClass, nil }.to raise_error(SampleClass) end it 'allows rescuing of a deprecated error with a deprecated error' do - begin - raise SampleDeprecatedClass, nil - rescue SampleDeprecatedClass - rescue StandardError => exc - fail "rescued #{exc.class.name} instead" - end + expect { raise SampleDeprecatedClass, nil }.to raise_error(SampleDeprecatedClass) end it 'allows rescuing of a deprecated error with a current error' do - begin - raise SampleDeprecatedClass, nil - rescue SampleClass - rescue StandardError => exc - fail "rescued #{exc.class.name} instead" - end + expect { raise SampleDeprecatedClass, nil }.to raise_error(SampleClass) end diff --git a/spec/faraday/error_spec.rb b/spec/faraday/error_spec.rb index 92bffe9a6..f99ae0071 100644 --- a/spec/faraday/error_spec.rb +++ b/spec/faraday/error_spec.rb @@ -73,39 +73,19 @@ end it 'allows rescuing of a current error with a deprecated error' do - begin - raise Faraday::ClientError, nil - rescue Faraday::Error::ClientError - rescue Faraday::Error => exc - fail "rescued #{exc.class.name} instead" - end + expect { raise Faraday::ClientError, nil }.to raise_error(Faraday::Error::ClientError) end it 'allows rescuing of a current error with a current error' do - begin - raise Faraday::ClientError, nil - rescue Faraday::ClientError - rescue Faraday::Error => exc - fail "rescued #{exc.class.name} instead" - end + expect { raise Faraday::ClientError, nil }.to raise_error(Faraday::ClientError) end it 'allows rescuing of a deprecated error with a deprecated error' do - begin - raise Faraday::Error::ClientError, nil - rescue Faraday::Error::ClientError - rescue Faraday::Error => exc - fail "rescued #{exc.class.name} instead" - end + expect { raise Faraday::Error::ClientError, nil }.to raise_error(Faraday::Error::ClientError) end it 'allows rescuing of a deprecated error with a current error' do - begin - raise Faraday::Error::ClientError, nil - rescue Faraday::ClientError - rescue Faraday::Error => exc - fail "rescued #{exc.class.name} instead" - end + expect { raise Faraday::Error::ClientError, nil }.to raise_error(Faraday::ClientError) end end