From a2e8d42c278547ebf0b160b10aebcd175dbae702 Mon Sep 17 00:00:00 2001 From: Johnny Shields Date: Tue, 8 Jan 2013 04:37:37 +0900 Subject: [PATCH] More isolation of Ruby version for Mongoid testing/travis purposes --- aasm.gemspec | 2 +- .../persistence/mongoid_persistance_spec.rb | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/aasm.gemspec b/aasm.gemspec index 6811b020..7f711c9a 100644 --- 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 index 5dbc7df5..68be2a54 100644 --- 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|