spec/spec_helper.rb in russian_phone-0.3.3 vs spec/spec_helper.rb in russian_phone-0.3.4

@@ -1,47 +1,40 @@
-# coding: utf-8
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'rspec'
-require 'simplecov'
-require 'mongoid'
-
-require 'database_cleaner'
-
-SimpleCov.start
-
-require 'russian_phone'
-
-# Requires supporting files with custom matchers and macros, etc,
-# in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
-
-def mongoid3?
-  defined?(Mongoid::VERSION) && Gem::Version.new(Mongoid::VERSION) >= Gem::Version.new('3.0.0')
-end
-
-Mongoid.configure do |config|
-  if mongoid3?
-    config.sessions[:default] = { :database => 'russian_phone_test', :hosts => ['localhost:27017'] }
-  else
-    config.master = Mongo::Connection.new.db('russian_phone_test')
-  end
-end
-
-DatabaseCleaner.orm = "mongoid"
-
-RSpec.configure do |config|
-  config.before(:all) do
-    DatabaseCleaner.strategy = :truncation
-  end
-
-  config.before(:each) do
-    DatabaseCleaner.start
-  end
-
-  config.after(:each) do
-    DatabaseCleaner.clean
-  end
-
-  config.mock_with :rspec
+# coding: utf-8
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'rspec'
+require 'simplecov'
+require 'mongoid'
+
+require 'database_cleaner'
+
+SimpleCov.start
+
+require 'russian_phone'
+
+# Requires supporting files with custom matchers and macros, etc,
+# in ./support/ and its subdirectories.
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+
+Mongoid.configure do |config|
+  ENV["MONGOID_ENV"] = "test"
+  Mongoid.load!("spec/support/mongoid.yml")
+end
+
+DatabaseCleaner.orm = "mongoid"
+
+RSpec.configure do |config|
+  config.before(:all) do
+    DatabaseCleaner.strategy = :truncation
+  end
+
+  config.before(:each) do
+    DatabaseCleaner.start
+  end
+
+  config.after(:each) do
+    DatabaseCleaner.clean
+  end
+
+  config.mock_with :rspec
 end
\ No newline at end of file