More isolation of Ruby version for Mongoid testing/travis purposes

rubyist · Jan 7, 2013 · a2e8d42 · a2e8d42
1 parent 8617786
commit a2e8d42
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/aasm.gemspec b/aasm.gemspec
@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.licenses    = ["MIT"]
 
   s.add_development_dependency 'activerecord'
-  s.add_development_dependency 'mongoid'
+  s.add_development_dependency 'mongoid' if Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3')
   s.add_development_dependency 'rake'
   s.add_development_dependency 'sdoc'
   s.add_development_dependency 'rspec', '~> 2.0'

diff --git a/spec/unit/persistence/mongoid_persistance_spec.rb b/spec/unit/persistence/mongoid_persistance_spec.rb
@@ -1,13 +1,14 @@
-require 'mongoid'
-require 'logger'
-require 'spec_helper'
-require File.dirname(__FILE__) + '/../../models/mongoid/mongoid_models'
+describe 'mongoid', if: Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3') do
 
-# if you want to see the statements while running the spec enable the following line
-# Mongoid.logger = Logger.new(STDERR)
-
-describe Mongoid, if: Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3') do
   before(:all) do
+    require 'mongoid'
+    require 'logger'
+    require 'spec_helper'
+    require File.dirname(__FILE__) + '/../../models/mongoid/mongoid_models'
+
+    # if you want to see the statements while running the spec enable the following line
+    # Mongoid.logger = Logger.new(STDERR)
+
     DATABASE_NAME = "mongoid_#{Process.pid}"
 
     Mongoid.configure do |config|