From f2d23ff3ca5c4cacb77d610569eafaf91a1f011e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Flode=CC=81n?= Date: Tue, 30 May 2017 00:13:12 +0200 Subject: [PATCH 1/2] Use webmock 3.0 Fixes problems with Ruby 2.4 and webmock --- omniauth-azure-activedirectory.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omniauth-azure-activedirectory.gemspec b/omniauth-azure-activedirectory.gemspec index 5fd46ad..9b82c3b 100644 --- a/omniauth-azure-activedirectory.gemspec +++ b/omniauth-azure-activedirectory.gemspec @@ -21,5 +21,5 @@ Gem::Specification.new do |s| s.add_development_dependency 'rspec', '~> 3.3' s.add_development_dependency 'rubocop', '~> 0.32' s.add_development_dependency 'simplecov', '~> 0.10' - s.add_development_dependency 'webmock', '~> 1.21' + s.add_development_dependency 'webmock', '~> 3.0.0' end From 93a9ac3298132d80120808e060ec080c63a45fc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Flode=CC=81n?= Date: Tue, 30 May 2017 00:14:42 +0200 Subject: [PATCH 2/2] Change ruby version in travis.yml Remove Ruby 2.1 and use 2.2.2 to fix problems with rack Also add ruby 2.3 and ruby 2.4 --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8eaab14..fcd8aaa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,8 @@ language: ruby rvm: - - 2.1 - - 2.2 + - 2.2.2 + - 2.3 + - 2.4 script: bundle exec rake spec