@@ -15,7 +15,7 @@ class BrainBuster < ActiveRecord::Base end def self.find_random_or_previous(id = nil) - id.nil? ? find_random : find_specific_or_fallback + id ? find_specific_or_fallback(id) : find_random end def self.random_function @@ -31,7 +31,7 @@ class BrainBuster < ActiveRecord::Base find(:first, :order => random_function) end - def self.find_specific_or_fallback + def self.find_specific_or_fallback(id) find(id) rescue ActiveRecord::RecordNotFound find_random lib/brain_buster.rb @@ -52,6 +52,7 @@ describe "BrainBuster" do describe "with real db" do include SpecHelper before { setup_database } + after { teardown_database } it "finds random" do brain_buster = BrainBuster.create!(:question => "What is best in life?", @@ -62,9 +63,9 @@ describe "BrainBuster" do it "finds specific record by id if provided" do brain_buster_1 = BrainBuster.create!(:question => "What is best in life?", :answer => "To crush your enemies, see them driven before you, and to hear the lamentation of the women.") - brain_buster_2 = BrainBuster.create!(:question => "What is 2+2?", :answer => "4") + brain_buster_2 = BrainBuster.create!(:question => "What is 2+2?", :answer => "4").reload - BrainBuster.find_random_or_previous(brain_buster_2.id).should == brain_buster_2.reload + BrainBuster.find_random_or_previous(brain_buster_2.id).should == brain_buster_2 end it "falls back to a different record if a specific brain_buster was delete" do spec/brain_buster_spec.rb @@ -26,6 +26,7 @@ require File.dirname(__FILE__) + '/../init' module SpecHelper LOG_FILE_NAME = File.expand_path(File.join(File.dirname(__FILE__), "tmp", "test.log")) + DATABASE = File.expand_path(File.join(File.dirname(__FILE__), "tmp", "brain_buster.sqlite3")) def logger @logger ||= Logger.new(LOG_FILE_NAME) @@ -53,7 +54,7 @@ module SpecHelper gem 'sqlite3-ruby' ActiveRecord::Base.logger = Logger.new(LOG_FILE_NAME) - ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => '/tmp/brain_buster.sqlite') + ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => DATABASE) ActiveRecord::Migration.verbose = false ActiveRecord::Schema.define do @@ -62,7 +63,10 @@ module SpecHelper t.column :answer, :string end end - + end + + def teardown_database + FileUtils.rm DATABASE end end \ No newline at end of file spec/spec_helper.rb 497fedf6e9615aca4c265b242db4d5e0918f83d8 Rob Sanheim rsanheim@gmail.com http://github.com/rsanheim/brain_buster/commit/635afdff067a7d0efa2051d7b305c9066f989e30 635afdff067a7d0efa2051d7b305c9066f989e30 2009-01-09T11:44:17-08:00 2009-01-09T11:44:17-08:00 oops, fix a the find when we have an id...clean up the database while we are at it... 1c82eefedcebf3543ec367e5ecef069f4b113398 Rob Sanheim rsanheim@gmail.com