lib/scenarios/extensions/active_record.rb lib/scenarios/table_blasting.rb @@ -2,6 +2,13 @@ class Person < ActiveRecord::Base; end class Place < ActiveRecord::Base; end class Thing < ActiveRecord::Base; end class Note < ActiveRecord::Base; end + +class SideEffectyThing < ActiveRecord::Base + after_create do + Thing.create! + end +end + module ModelModule class Model < ActiveRecord::Base; end end \ No newline at end of file app/models.rb @@ -1,28 +1,31 @@ ActiveRecord::Schema.define do - create_table "people", :force => true do |t| - t.column "first_name", :string - t.column "last_name", :string + create_table :people, :force => true do |t| + t.column :first_name, :string + t.column :last_name, :string end - create_table "places", :force => true do |t| - t.column "name", :string - t.column "location", :string + create_table :places, :force => true do |t| + t.column :name, :string + t.column :location, :string end - create_table "things", :force => true do |t| - t.column "name", :string - t.column "description", :string + create_table :things, :force => true do |t| + t.column :name, :string + t.column :description, :string + end + + create_table :side_effecty_things, :force => true do |t| end create_table :models, :force => true do |t| - t.column "name", :string - t.column "description", :string + t.column :name, :string + t.column :description, :string end - create_table "notes", :force => true do |t| - t.column "content", :string - t.column "created_at", :datetime - t.column "updated_at", :datetime + create_table :notes, :force => true do |t| + t.column :content, :string + t.column :created_at, :datetime + t.column :updated_at, :datetime end end \ No newline at end of file app/schema.rb @@ -22,6 +22,7 @@ Scenario = Scenarios require 'active_record/fixtures' require 'scenarios/configuration' +require 'scenarios/table_blasting' require 'scenarios/table_methods' require 'scenarios/loading' require 'scenarios/base' lib/scenarios.rb @@ -2,4 +2,5 @@ extdir = File.dirname(__FILE__) + '/extensions' require "#{extdir}/string" require "#{extdir}/symbol" -require "#{extdir}/test_case" rescue nil \ No newline at end of file +require "#{extdir}/test_case" rescue nil +require "#{extdir}/active_record" \ No newline at end of file lib/scenarios/extensions.rb @@ -9,6 +9,7 @@ module Scenarios def load_scenarios(scenario_classes) self.table_config = Configuration.new + ActiveRecord::ConnectionAdapters::AbstractAdapter.table_config = self.table_config self.class.loaded_scenarios = [] previous_scenario = nil if scenario_classes lib/scenarios/loading.rb @@ -3,8 +3,10 @@ module Scenarios # available to all Scenario instances, test and example classes, and test # and example instances. module TableMethods - attr_accessor :table_config - delegate :table_readers, :blasted_tables, :record_metas, :symbolic_names_to_id, :to => :table_config + include TableBlasting + + attr_accessor :table_config unless respond_to?(:table_config) + delegate :table_readers, :record_metas, :symbolic_names_to_id, :to => :table_config # Insert a record into the database, add the appropriate helper methods # into the scenario and spec, and return the ID of the inserted record: @@ -57,13 +59,6 @@ module Scenarios end end - def blast_table(name) # :nodoc: - ActiveRecord::Base.silence do - ActiveRecord::Base.connection.delete "DELETE FROM #{name}", "Scenario Delete" - end - blasted_tables << name - end - private def insert(record_or_model, class_identifier, *args, &insertion) symbolic_name, attributes = extract_creation_arguments(args) lib/scenarios/table_methods.rb @@ -150,5 +150,8 @@ describe "create_model table method" do things(:mything).should == thing end - it "should blast any table touched as a side effect of creating a model (callbacks, observers, etc.)" + it "should blast any table touched as a side effect of creating a model (callbacks, observers, etc.)" do + create_model SideEffectyThing + blasted_tables.should include(Thing.table_name) + end end \ No newline at end of file spec/scenarios_spec.rb @@ -2,8 +2,6 @@ namespace :db do namespace :scenario do desc "Load a scenario into the current environment's database using SCENARIO=scenario_name" task :load => 'db:reset' do - ActiveRecord::Base.instantiate_observers - scenario_name = ENV['SCENARIO'] || 'default' begin klass = Scenarios.load(scenario_name) tasks/scenario.rake 491a83f6012933dda2a91a6be22e4d25cca82ea6 Adam Williams adam@thewilliams.ws http://github.com/aiwilliams/scenarios/commit/52abb358e3f2590d17a8c5642337c4a07a74ec3f 52abb358e3f2590d17a8c5642337c4a07a74ec3f 2007-11-29T16:46:58-08:00 2007-11-29T16:46:58-08:00 scenarios: when create_model is used, and those models have side effects which insert data, the tables are appropriately blasted b4f3e7867297d33925bca406cbf5dd106987e12c Adam Williams adam@thewilliams.ws