Changeset 386

Show
Ignore:
Timestamp:
04/22/07 01:10:52 (1 year ago)
Author:
jlong
Message:

mental: fixed extension_fixtures class method

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/mental/radiant/lib/generators/extension/extension_generator.rb

    r188 r386  
    1616      m.directory "#{extension_path}/db/migrate" 
    1717      m.directory "#{extension_path}/lib/tasks" 
     18      m.directory "#{extension_path}/test/fixtures" 
    1819      m.directory "#{extension_path}/test/functional" 
    1920      m.directory "#{extension_path}/test/unit" 

  • branches/mental/radiant/lib/generators/extension/templates/functional_test.rb

    r382 r386  
    11require File.dirname(__FILE__) + '/../test_helper' 
    22 
    3 class <%= class_name %>Test < TestExtensionTest 
     3class <%= class_name %>Test < <%= class_name %>TestCase 
    44   
    55  # Replace this with your real tests. 

  • branches/mental/radiant/lib/generators/extension/templates/test_helper.rb

    r385 r386  
    11require File.dirname(__FILE__) + "/../../../../test/test_helper" unless defined? TEST_ROOT 
    22 
    3 class <%= class_name %>Test < Test::Unit::TestCase 
     3class <%= class_name %>TestCase < Test::Unit::TestCase 
    44  test_helper :extension_fixtures, :extension_tags 
    55  self.extension_fixture_path = File.dirname(__FILE__) + "/fixtures" 

  • branches/mental/radiant/lib/generators/extension_controller/templates/functional_test.rb

    r383 r386  
    44<%= class_name %>Controller.class_eval { def rescue_action(e) raise e end } 
    55 
    6 class <%= class_name %>ControllerTest < <%= extension_name %>ExtensionTest 
     6class <%= class_name %>ControllerTest < <%= extension_name %>ExtensionTestCase 
    77  def setup 
    88    @controller = <%= class_name %>Controller.new 

  • branches/mental/radiant/lib/generators/extension_model/templates/unit_test.rb

    r383 r386  
    11require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../test_helper' 
    22 
    3 class <%= class_name %>Test < <%= extension_name %>ExtensionTest 
     3class <%= class_name %>Test < <%= extension_name %>ExtensionTestCase 
    44  extension_fixtures :<%= table_name %> 
    55 

  • branches/mental/radiant/test/helpers/extension_fixture_test_helper.rb

    r380 r386  
    11module ExtensionFixtureTestHelper 
    22  def self.included(base) 
    3     unless base.ancestors.include? ClassMethods 
     3    unless base < ClassMethods 
     4      base.send :include, InstanceMethods 
    45      base.extend ClassMethods  
    56      base.class_eval do 
    …… 
    2122  end 
    2223 
    23   def load_fixtures_with_extensions 
    24     load_fixtures_without_extensions 
    25     @loaded_fixtures ||= {} 
    26     unless extension_fixture_table_names.empty? or extension_fixture_path.empty? 
    27       fixtures = Fixtures.create_fixtures(extension_fixture_path, extension_fixture_table_names, fixture_class_names) 
    28       unless fixtures.nil? 
    29         if fixtures.instance_of?(Fixtures) 
    30           @loaded_fixtures[fixtures.table_name] = fixtures 
    31         else 
    32           fixtures.each { |f| @loaded_fixtures[f.table_name] = f } 
     24  module InstanceMethods 
     25    def load_fixtures_with_extensions 
     26      @loaded_fixtures = {} 
     27      fixtures = Fixtures.create_fixtures(fixture_path, fixture_table_names, fixture_class_names), 
     28      extension_fixtures = Fixtures.create_fixtures(extension_fixture_path, extension_fixture_table_names, fixture_class_names) 
     29      [fixtures, extension_fixtures].each do |f| 
     30        unless f.nil? 
     31          if f.instance_of?(Fixtures) 
     32            @loaded_fixtures[f.table_name] = f 
     33          else 
     34            f.each { |x| @loaded_fixtures[x.table_name] = x unless x.nil? } 
     35          end 
    3336        end 
    3437      end