Skip to content

Commit 1e79758

Browse files
committed
Merge pull request #136 from intercom/jo/update-to-remove-some-ruby2.2.0-warnings
update to fix ruby 2.2.0 warnings
2 parents 1af674d + 39b23f1 commit 1e79758

File tree

4 files changed

+3
-3
lines changed

4 files changed

+3
-3
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ rvm:
33
- 1.9.3
44
- 2.0.0
55
- 2.1.0
6+
- 2.2.0

lib/intercom/request.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ def parse_body(decoded_body, response)
8484
return parsed_body if decoded_body.nil? || decoded_body.strip.empty?
8585
begin
8686
parsed_body = JSON.parse(decoded_body)
87-
rescue JSON::ParserError => e
87+
rescue JSON::ParserError => _
8888
raise_errors_on_failure(response)
8989
end
9090
raise_application_errors_on_failure(parsed_body, response.code.to_i) if parsed_body['type'] == 'error.list'

spec/spec_helper.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ def test_user(email="[email protected]")
1111
"name" => "Joe Schmoe",
1212
"avatar" => {"type"=>"avatar", "image_url"=>"https://graph.facebook.com/1/picture?width=24&height=24"},
1313
"app_id" => "the-app-id",
14-
"created_at" => 1323422442,
1514
"custom_attributes" => {"a" => "b", "b" => 2},
1615
"companies" =>
1716
{"type"=>"company.list",

spec/unit/intercom/company_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
describe 'when no response raises error' do
66
it 'on find' do
77
Intercom.expects(:get).with("/companies", {:company_id => '4'}).returns(nil)
8-
proc {company = Intercom::Company.find(:company_id => '4')}.must_raise Intercom::HttpError
8+
proc {Intercom::Company.find(:company_id => '4')}.must_raise Intercom::HttpError
99
end
1010

1111
it 'on find_all' do

0 commit comments

Comments
 (0)