From e510817abfa33fd26f6ed6f36b47948bc11a2cb9 Mon Sep 17 00:00:00 2001 From: Andrew Korzhuev Date: Sun, 12 Oct 2014 23:01:58 +0700 Subject: [PATCH 1/2] Remove jazz-hands dependency --- Gemfile | 4 ---- grape-active_model_serializers.gemspec | 1 - spec/spec_helper.rb | 2 -- 3 files changed, 7 deletions(-) diff --git a/Gemfile b/Gemfile index 09752c9..fa75df1 100644 --- 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 index ea6f8b0..fc2b060 100644 --- 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/spec/spec_helper.rb b/spec/spec_helper.rb index 6cb85c2..55f4181 100644 --- 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 From 172d1710bb535ba34375b9d0a0a64f1a6ea936da Mon Sep 17 00:00:00 2001 From: Andrew Korzhuev Date: Sun, 12 Oct 2014 23:02:08 +0700 Subject: [PATCH 2/2] Add Ruby 2 & 2.1 to Travis --- lib/.travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/.travis.yml b/lib/.travis.yml index 1852caf..75d2a2e 100644 --- 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" \ No newline at end of file + - JRUBY_OPTS="--1.9"