Merge branch 'master' of github.com:diaspora/diaspora

This commit is contained in:
maxwell 2010-10-10 11:54:16 -07:00
commit fd0902abb4

View file

@ -24,7 +24,7 @@ describe DevUtilitiesController do
before do
@backer_number_file = File.join(File.dirname(__FILE__), "..", "..", "config", "backer_number.yml")
@temp_file = File.join(File.dirname(__FILE__), "..", "..", "config", "backer_number.yml-tmp")
FileUtils.mv(@backer_number_file, @temp_file, :force => true)
FileUtils.mv(@backer_number_file, @temp_file, :force => true) if File.exists?(@backer_number_file)
end
after do
if File.exists?(@temp_file)