Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 15 additions & 26 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,35 +1,24 @@
version: 2
version: 2.1
jobs:
"Test against Ruby 2.4":
test:
parameters:
ruby_version:
type: string
docker:
- image: circleci/ruby:2.4.9
working_directory: ~/intercom-ruby
- image: cimg/ruby:<< parameters.ruby_version >>
steps:
- checkout
- run: bundle install
- run: bundle exec rake
"Test against Ruby 2.5":
docker:
- image: circleci/ruby:2.5.7
working_directory: ~/intercom-ruby
steps:
- checkout
- run: bundle install
- run: bundle exec rake
"Test against Ruby 2.6":
docker:
- image: circleci/ruby:2.6.5
working_directory: ~/intercom-ruby
steps:
- checkout
- run: bundle install
- run: bundle exec rake

workflows:
version: 2
build_and_test:
jobs:
- "Test against Ruby 2.4"
- "Test against Ruby 2.5"
- "Test against Ruby 2.6"

- test:
name: "Test against Ruby 3.1"
ruby_version: "3.1"
- test:
name: "Test against Ruby 3.2"
ruby_version: "3.2"
- test:
name: "Test against Ruby 3.3"
ruby_version: "3.3"
4 changes: 2 additions & 2 deletions intercom.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ Gem::Specification.new do |spec|
spec.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
spec.require_paths = ["lib"]

spec.add_development_dependency 'minitest', '~> 5.4'
spec.add_development_dependency 'minitest', '~> 5.4', '< 5.19'
spec.add_development_dependency "m", "~> 1.5.0"
spec.add_development_dependency 'rake', '~> 10.3'
spec.add_development_dependency 'rake', '~> 13.0'
spec.add_development_dependency 'mocha', '~> 1.0'
spec.add_development_dependency "fakeweb", ["~> 1.3"]
spec.add_development_dependency "pry"
Expand Down
2 changes: 1 addition & 1 deletion lib/intercom/client.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def set_timeouts(open_timeout: nil, read_timeout: nil)
timeouts[:open_timeout] = open_timeout if open_timeout
timeouts[:read_timeout] = read_timeout if read_timeout
o.send(:timeouts=, timeouts)
proc { |_obj| set_timeouts(old_timeouts).call(o) }
proc { |_obj| set_timeouts(**old_timeouts).call(o) }
end
end
end
Expand Down