Merge pull request #421 from drapergem/test_rails_master

Test and allow failures against Rails master
drapergem · Jan 14, 2013 · e9b71e3 · e9b71e3
2 parents 130edec + b3d5879
commit e9b71e3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 13 deletions.
diff --git 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"
diff --git 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