lib/spec/rails/extensions/spec/runner/configuration.rb in dchelimsky-rspec-rails-1.1.12 vs lib/spec/rails/extensions/spec/runner/configuration.rb in dchelimsky-rspec-rails-1.1.99.1

- old
+ new

@@ -1,76 +1,44 @@ require 'spec/runner/configuration' require 'test_help' -begin -module Spec - module Runner - class Configuration +if defined?(ActiveRecord::Base) + module Spec + module Runner + class Configuration - TEST_CASE = ActiveSupport.const_defined?(:TestCase) ? ActiveSupport::TestCase : Test::Unit::TestCase - - # Rails 1.2.3 does a copy of the @inheritable_attributes to the subclass when the subclass is - # created. This causes an ordering issue when setting state on Configuration because the data is - # already copied. - # Iterating over EXAMPLE_GROUP_CLASSES causes the base ExampleGroup classes to have their - # @inheritable_attributes updated. - # TODO: BT - When we no longer support Rails 1.2.3, we can remove this functionality - EXAMPLE_GROUP_CLASSES = [ - TEST_CASE, - ::Spec::Rails::Example::RailsExampleGroup, - ::Spec::Rails::Example::FunctionalExampleGroup, - ::Spec::Rails::Example::ControllerExampleGroup, - ::Spec::Rails::Example::ViewExampleGroup, - ::Spec::Rails::Example::HelperExampleGroup, - ::Spec::Rails::Example::ModelExampleGroup - ] - # All of this is ActiveRecord related and makes no sense if it's not used by the app - if defined?(ActiveRecord::Base) def initialize super self.fixture_path = RAILS_ROOT + '/spec/fixtures' end def use_transactional_fixtures - TEST_CASE.use_transactional_fixtures + ActiveSupport::TestCase.use_transactional_fixtures end def use_transactional_fixtures=(value) - EXAMPLE_GROUP_CLASSES.each do |example_group| - example_group.use_transactional_fixtures = value - end + ActiveSupport::TestCase.use_transactional_fixtures = value end def use_instantiated_fixtures - TEST_CASE.use_instantiated_fixtures + ActiveSupport::TestCase.use_instantiated_fixtures end def use_instantiated_fixtures=(value) - EXAMPLE_GROUP_CLASSES.each do |example_group| - example_group.use_instantiated_fixtures = value - end + ActiveSupport::TestCase.use_instantiated_fixtures = value end def fixture_path - TEST_CASE.fixture_path + ActiveSupport::TestCase.fixture_path end def fixture_path=(path) - EXAMPLE_GROUP_CLASSES.each do |example_group| - example_group.fixture_path = path - end + ActiveSupport::TestCase.fixture_path = path end def global_fixtures - TEST_CASE.fixture_table_names + ActiveSupport::TestCase.fixture_table_names end def global_fixtures=(fixtures) - EXAMPLE_GROUP_CLASSES.each do |example_group| - example_group.fixtures(*fixtures) - end + ActiveSupport::TestCase.fixtures(*fixtures) end end end end end -rescue Exception => e - puts e.message - puts e.backtrace - raise e -end \ No newline at end of file