Merge branch 'fix-mocha-version' of github.com:galois17/oauth-ruby in…

…to fix-ssl-noverify
oauth-xx · Nov 23, 2020 · 87064ce · 87064ce
2 parents eb5b00a + c0d9c39
commit 87064ce
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,10 +2,13 @@ language: ruby
 
 rvm:
 - "ruby-head"
+- "2.7"
 - "2.4.0"
 - "2.3"
 - "2.2"
-
+matrix:
+  allow_failures:
+    - rvm: "ruby-head"
 addons:
   code_climate:
     repo_token: 8f697ca756250f0c2c54170ae27e8a9c459d18a0236903b11291c88291b3aac9

diff --git a/oauth.gemspec b/oauth.gemspec
@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency("iconv")
   spec.add_development_dependency("rack", "~> 2.0")
   spec.add_development_dependency("rack-test")
-  spec.add_development_dependency("mocha", ">= 0.9.12")
+  spec.add_development_dependency("mocha", ">= 0.9.12", "<=1.1.0")
   spec.add_development_dependency("typhoeus", ">= 0.1.13")
   spec.add_development_dependency("em-http-request", "0.2.11")
   spec.add_development_dependency("curb")