diff --git a/Gemfile b/Gemfile index 1c2c4b0d..ed1e5df6 100644 --- a/Gemfile +++ b/Gemfile @@ -4,3 +4,11 @@ source 'https://rubygems.org' gemspec gem "minitest" + +version = ENV["RAILS_VERSION"] || "4.0" + +if version == "master" + gem "rails", github: "rails/rails" +else + gem "rails", "~> #{version}" +end diff --git a/active_model_serializers.gemspec b/active_model_serializers.gemspec index 65d6f44c..a3606fd4 100644 --- a/active_model_serializers.gemspec +++ b/active_model_serializers.gemspec @@ -18,6 +18,9 @@ Gem::Specification.new do |spec| spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.require_paths = ["lib"] + spec.add_dependency "activesupport", ">= 3.2" + spec.add_dependency "rails", ">= 3.2" + spec.add_development_dependency "bundler", "~> 1.6" spec.add_development_dependency "rake" end diff --git a/test/test_helper.rb b/test/test_helper.rb index e69de29b..0834af7e 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -0,0 +1,7 @@ +require "bundler/setup" + +require "active_model_serializers" +require "active_support/json" + +require 'rails' +