Merge pull request #318 from dmathieu/tests-sinatra1

Run tests using sinatra 1 as well as sinatra 2
interagent · Nov 22, 2017 · 704cd0e · 704cd0e
2 parents 51ee665 + 86720e8
commit 704cd0e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,9 @@ rvm:
   - 2.4.0
   - 2.3.3
   - 2.2.2
+env:
+  - SINATRA_MAJOR=1
+  - SINATRA_MAJOR=2
 addons:
   postgresql: '9.3'
 before_install:

diff --git a/Gemfile b/Gemfile
@@ -1,3 +1,4 @@
 source "https://rubygems.org"
 
 gemspec
+gem 'sinatra', "~> #{ENV["SINATRA_MAJOR"] || 2}.x"