Merge pull request #27 from andrusha/look-ma-no-hands

Enable Ruby 2 and 2.1 on Travis
ruby-grape · Oct 12, 2014 · c2aed6f · c2aed6f
2 parents 85b92a4 + 172d171
commit c2aed6f
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 8 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,7 +1,3 @@
 source 'https://rubygems.org'
 
 gemspec
-
-group :test do
-  gem 'jazz_hands', git: 'https://github.com/jrhe/jazz_hands.git', branch: 'without_rails' 
-end
diff --git a/grape-active_model_serializers.gemspec b/grape-active_model_serializers.gemspec
@@ -22,6 +22,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "rspec"
   gem.add_development_dependency "rack-test"
   gem.add_development_dependency "rake"
-  gem.add_development_dependency "jazz_hands"
   gem.add_development_dependency 'guard-rspec'
 end
diff --git a/lib/.travis.yml b/lib/.travis.yml
@@ -1,8 +1,10 @@
 rvm:
   - 1.9.2
   - 1.9.3
+  - 2.0.0
+  - 2.1.2
   - ruby-head
   - rbx-19mode
 
 env:
-   - JRUBY_OPTS="--1.9"
+   - JRUBY_OPTS="--1.9"
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -11,8 +11,6 @@
 require 'rack/test'
 require 'grape-active_model_serializers'
 
-require 'jazz_hands'
-
 RSpec.configure do |config|
   config.include Rack::Test::Methods
 end