diff --git a/config/initializers/_mongo.rb b/config/initializers/_mongo.rb index 2fde0f2ed..4fc323351 100644 --- a/config/initializers/_mongo.rb +++ b/config/initializers/_mongo.rb @@ -1,4 +1,5 @@ MongoMapper.connection = Mongo::Connection.new('localhost', 27017) + MongoMapper.database = "#diaspora-#{Rails.env}" if defined?(PhusionPassenger) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 1c76dd26f..2b6f72bfc 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,10 +1,10 @@ # This file is copied to ~/spec when you run 'ruby script/generate rspec' # from the project root directory. + ENV["RAILS_ENV"] ||= 'test' require File.dirname(__FILE__) + "/../config/environment" unless defined?(Rails) require 'rspec/rails' require 'database_cleaner' -#require File.dirname(__FILE__) + "/factories" include Devise::TestHelpers # Requires supporting files with custom matchers and macros, etc, @@ -24,12 +24,11 @@ Rspec.configure do |config| config.before(:each) do DatabaseCleaner.start - #WebSocket.stub!(:update_clients) + WebSocket.stub!(:update_clients) end config.after(:each) do DatabaseCleaner.clean - #Factory.sequences.each{ |s| s.reset} end end