From 0da4f273cf0f7b993a0232b6cfc066b0646dd85e Mon Sep 17 00:00:00 2001 From: Steve Klabnik Date: Mon, 14 Jan 2013 07:07:38 -0500 Subject: [PATCH 1/2] Test and allow failures against Rails master --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index fd63650a..52acbdf3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,8 @@ env: - "RAILS_VERSION=3.2" - "RAILS_VERSION=3.1" - "RAILS_VERSION=3.0" + - "RAILS_VERSION=master" matrix: allow_failures: - rvm: ruby-head + - env: "RAILS_VERSION=master" From b3d58792b7a3bd296e7c89d78a991931f961d7d5 Mon Sep 17 00:00:00 2001 From: Andrew Haines Date: Mon, 14 Jan 2013 12:59:49 +0000 Subject: [PATCH 2/2] Get specs running on Rails master --- spec/support/active_record.rb | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/spec/support/active_record.rb b/spec/support/active_record.rb index b581423b..b6a5db40 100644 --- a/spec/support/active_record.rb +++ b/spec/support/active_record.rb @@ -1,18 +1,5 @@ module ActiveRecord class Base - include ActiveModel::Validations - include ActiveModel::Conversion - - attr_reader :errors, :to_model - - def initialize - @errors = ActiveModel::Errors.new(self) - end - - def self.limit - self - end - end end