Added dependency scenarios to the build matrix

Including Rails 4
rmm5t · Mar 24, 2013 · bdd123e · bdd123e
1 parent 996c163
commit bdd123e
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,5 +2,6 @@
 .bundle
 vendor/ruby
 Gemfile.lock
+gemfiles/*.lock
 pkg/*
 rdoc/*
diff --git a/.travis.yml b/.travis.yml
@@ -6,4 +6,9 @@ rvm:
   - jruby-18mode
   - jruby-19mode
   - rbx-18mode
-  - rbx-19mode
+  - rbx-19mode
+gemfile:
+  - Gemfile
+  - gemfiles/activemodel-3.1.gemfile
+  - gemfiles/activemodel-3.2.gemfile
+  - gemfiles/activemodel-master.gemfile
diff --git a/gemfiles/activemodel-3.1.gemfile b/gemfiles/activemodel-3.1.gemfile
@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem "activemodel", "~> 3.1.0"
+
+gemspec path: "../"
diff --git a/gemfiles/activemodel-3.2.gemfile b/gemfiles/activemodel-3.2.gemfile
@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem "activemodel", "~> 3.2.0"
+
+gemspec path: "../"
diff --git a/gemfiles/activemodel-master.gemfile b/gemfiles/activemodel-master.gemfile
@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem "activemodel", github: "rails/rails", branch: "master"
+
+gemspec path: "../"
diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -4,6 +4,9 @@
 require "strip_attributes"
 
 class Tableless
-  include ActiveAttr::Model
+  include ActiveAttr::BasicModel
+  include ActiveAttr::TypecastedAttributes
+  include ActiveAttr::Serialization
+
   include ActiveModel::Validations::Callbacks
 end