Skip to content

Commit

Permalink
Fix RuboCop offenses introduced in version 0.20.0
Browse files Browse the repository at this point in the history
  • Loading branch information
sferik committed Apr 4, 2014
1 parent 7b40188 commit e5e5f48
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
5 changes: 4 additions & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AllCops:
Includes:
Include:
- 'Gemfile'
- 'Rakefile'
- 'twitter.gemspec'
Expand Down Expand Up @@ -90,3 +90,6 @@ PercentLiteralDelimiters:
'%w': '[]'
'%W': '[]'
'%x': ()

NonNilCheck:
Enabled: false
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ group :test do
gem 'coveralls', :require => false
gem 'mime-types', '~> 1.25', :platforms => [:jruby, :ruby_18]
gem 'rspec', '>= 2.14'
gem 'rubocop', '>= 0.16', :platforms => [:ruby_19, :ruby_20, :ruby_21]
gem 'rubocop', '>= 0.20', :platforms => [:ruby_19, :ruby_20, :ruby_21]
gem 'simplecov', :require => false
gem 'timecop', '0.6.1'
gem 'webmock'
Expand Down
2 changes: 1 addition & 1 deletion lib/twitter/rest/client.rb
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ def request(method, path, params = {}, headers = {})
rescue Faraday::Error::TimeoutError, Timeout::Error => error
raise(Twitter::Error::RequestTimeout.new(error))
rescue Faraday::Error::ClientError, JSON::ParserError => error
fail(Twitter::Error.new(error))
raise(Twitter::Error.new(error))
end

def request_headers(method, path, params = {}, signature_params = params)
Expand Down
5 changes: 1 addition & 4 deletions spec/helper.rb
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
require 'simplecov'
require 'coveralls'

SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
SimpleCov::Formatter::HTMLFormatter,
Coveralls::SimpleCov::Formatter
]
SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[SimpleCov::Formatter::HTMLFormatter, Coveralls::SimpleCov::Formatter]

SimpleCov.start do
add_filter '/spec/'
Expand Down

0 comments on commit e5e5f48

Please sign in to comment.