Updating Appraisals and Lowering the Shoulda requirement, and only co…

…nfiguring when spec helper when rails is newer...

.travis.yml

@@ -3,7 +3,7 @@ cache: bundler
 sudo: false
 
 rvm:
-  - 2.1.4
+  - 2
 
 matrix:
   include:

Appraisals

@@ -1,11 +1,11 @@
 appraise "rails3.2" do
-  gem "rails", "~> 3.2.17"
+  gem "rails", "~> 3.2.21"
 end
 
 appraise "rails4.0" do
-  gem "rails", "~> 4.0.4"
+  gem "rails", "~> 4.0.13"
 end
 
 appraise "rails4.1" do
-  gem "rails", "~> 4.1.0"
+  gem "rails", "~> 4.1.13"
 end

gemfiles/rails3.2.gemfile

@@ -2,6 +2,7 @@
 
 source "http://rubygems.org"
 
-gem "rails", "~> 3.2.17"
+gem "rails", "~> 3.2.21"
+gem 'test-unit', '~> 3.0'
 
 gemspec :path => "../"

gemfiles/rails4.0.gemfile

@@ -1,7 +1,7 @@
 # This file was generated by Appraisal
 
-source "https://rubygems.org"
+source "http://rubygems.org"
 
-gem "rails", "~> 4.0.4"
+gem "rails", "~> 4.0.13"
 
 gemspec :path => "../"

gemfiles/rails4.1.gemfile

@@ -2,6 +2,6 @@
 
 source "http://rubygems.org"
 
-gem "rails", "~> 4.1.0"
+gem "rails", "~> 4.1.13"
 
 gemspec :path => "../"

mailboxer.gemspec

@@ -37,13 +37,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec-its', '~> 1.1'
   s.add_development_dependency 'rspec-collection_matchers', '~> 1.1'
   s.add_development_dependency('appraisal', '~> 1.0.0')
-  s.add_development_dependency('shoulda-matchers', '~> 3')
-  # Fixtures
-  #if RUBY_VERSION >= '1.9.2'
-   # s.add_development_dependency('factory_girl', '>= 3.0.0')
-  #else
-    #s.add_development_dependency('factory_girl', '~> 2.6.0')
-  #end
+  s.add_development_dependency('shoulda-matchers', '~> 2')
   s.add_development_dependency('factory_girl', '~> 2.6.0')
   # Population
   s.add_development_dependency('forgery', '>= 0.3.6')

spec/spec_helper.rb

@@ -30,12 +30,12 @@
 
 # Shoulda Matchers
 require 'shoulda/matchers'
-
-Shoulda::Matchers.configure do |config|
-  config.integrate do |with|
-    # Choose a test framework:
-    with.test_framework :rspec
-    with.library :rails
+if Shoulda::Matchers.respond_to?(:configure)
+  Shoulda::Matchers.configure do |config|
+    config.integrate do |with|
+      with.test_framework :rspec
+      with.library :rails
+    end
   end
 end