diff --git a/.travis.yml b/.travis.yml index fac82fd..20884b8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,6 +31,11 @@ rvm: - 2.1.0-preview2 - rbx-2.2.1 +env: + - "RAILS_VERSION=3.2" + - "RAILS_VERSION=4.0" + - "RAILS_VERSION=4.1" + notifications: email: - raphael.valyi@akretion.com diff --git a/Gemfile b/Gemfile index dae4448..c334c35 100644 --- a/Gemfile +++ b/Gemfile @@ -2,8 +2,7 @@ source "http://rubygems.org" gemspec -#rails_version = ENV["RAILS_VERSION"] || "4.1" -#gem "activemodel", "~> #{rails_version}" +gem "activemodel", "~> #{ENV["RAILS_VERSION"]}" if ENV["RAILS_VERSION"] group :test do gem 'rspec' diff --git a/spec/ooor_spec.rb b/spec/ooor_spec.rb index 3eb9b05..af6319d 100644 --- a/spec/ooor_spec.rb +++ b/spec/ooor_spec.rb @@ -730,7 +730,7 @@ end s1.object_id.should_not == s2.object_id - obj1.should == obj2 + obj1.should == obj2 unless ActiveModel::VERSION::STRING.start_with? "3.2" #for some reason this doesn't work with Rails 3.2 end