spec/unit/adapters/abstract_adapter_spec.rb spec/unit/adapters/adapter_shared_spec.rb spec/unit/adapters/data_objects_adapter_spec.rb spec/unit/associations/many_to_many_spec.rb spec/unit/associations/many_to_one_spec.rb spec/unit/associations/one_to_many_spec.rb spec/unit/associations/one_to_one_spec.rb spec/unit/associations/relationship_spec.rb spec/unit/cli_spec.rb spec/unit/dependency_spec.rb spec/unit/hook_spec.rb spec/unit/identity_map_spec.rb spec/unit/loaded_set_spec.rb spec/unit/naming_conventions_spec.rb spec/unit/property_set_spec.rb spec/unit/property_spec.rb spec/unit/query_spec.rb spec/unit/repository_spec.rb spec/unit/resource_spec.rb spec/unit/scope_spec.rb spec/unit/support/aliasinghash_spec.rb spec/unit/support/blank_spec.rb spec/unit/support/inflection_spec.rb spec/unit/support/object_spec.rb spec/unit/support/string_spec.rb spec/unit/support/struct_spec.rb spec/unit/type_spec.rb @@ -1,22 +1,26 @@ Autotest.add_hook :initialize do |at| - ignore = %w{.git burn www log plugins script tasks bin CHANGELOG FAQ MIT-LICENSE PERFORMANCE QUICKLINKS README} + ignore = %w[ .git burn www log plugins script tasks bin CHANGELOG FAQ MIT-LICENSE PERFORMANCE QUICKLINKS README ] + unless ENV['AUTOTEST'] == 'integration' ignore << 'spec/integration' end - - ignore.each do |exception| + + ignore.each do |exception| at.add_exception(exception) end - + at.clear_mappings - at.add_mapping(%r%^spec/.*\.rb$%) { |filename, _| - filename - } - at.add_mapping(%r%^lib/data_mapper/(.*)\.rb$%) { |_, m| - ["spec/#{m[1]}_spec.rb"] - } - at.add_mapping(%r%^spec/spec_helper.rb$%) { - at.files_matching %r%^spec/.*_spec\.rb$% - } - -end \ No newline at end of file + + at.add_mapping(%r{^spec/.+_spec\.rb$}) do |filename,_| + filename + end + + at.add_mapping(%r{^lib/data_mapper/(.+)\.rb$}) do |_,match| + [ "spec/unit/#{match[1]}_spec.rb" ] + + at.files_matching(%r{^spec/integration/.+_spec\.rb$}) + end + + at.add_mapping(%r{^spec/spec_helper\.rb$}) do + at.files_matching(%r{^spec/.+_spec\.rb$}) + end +end .autotest @@ -49,7 +49,6 @@ begin coconut = TypeTests::Coconut.new(:faked => 'bob', :document => @document, :stuff => @stuff) coconut.faked.should == 'bob' coconut.document.should be_a_kind_of(Array) - p coconut.stuff coconut.stuff.should be_a_kind_of(Hash) end spec/integration/type_spec.rb @@ -1 +1 @@ ---require spec/spec_helper + spec/spec.opts @@ -10,6 +10,8 @@ ENV['LOG_NAME'] = 'spec' require __DIR__.parent + 'environment' require __DIR__ + 'mock_adapter' +ROOT_DIR = __DIR__.parent + class Article include DataMapper::Resource spec/spec_helper.rb spec/adapter_shared_spec.rb spec/adapters/abstract_adapter_spec.rb spec/adapters/data_objects_adapter_spec.rb spec/associations/many_to_many_spec.rb spec/associations/many_to_one_spec.rb spec/associations/one_to_many_spec.rb spec/associations/one_to_one_spec.rb spec/associations/relationship_spec.rb spec/cli_spec.rb spec/dependency_spec.rb spec/hook_spec.rb spec/identity_map_spec.rb spec/inflection_spec.rb spec/loaded_set_spec.rb spec/naming_conventions_spec.rb spec/property_set_spec.rb spec/property_spec.rb spec/query_spec.rb spec/repository_spec.rb spec/resource_spec.rb spec/scope_spec.rb spec/support/aliasinghash_spec.rb spec/support/blank_spec.rb spec/support/object_spec.rb spec/support/string_spec.rb spec/support/struct_spec.rb spec/type_spec.rb 19d6c9829a297c4140f7b3e772ac3e05035abf96 Dan Kubb dan.kubb@autopilotmarketing.com http://github.com/sam/dm-core/commit/81d2787c0e427c0e805d15be69190c80a8c21b2d 81d2787c0e427c0e805d15be69190c80a8c21b2d 2008-04-10T00:00:26-07:00 2008-04-10T00:00:26-07:00 Moved unit specifications into spec/unit * spec/unit/* specs should specify the behaviour of the associated code with no external dependencies. * Updated autotest rules to match file layout change * Updated require paths within the unit specs 17c75929c709e7e0584d8a07d63d0fe63875b9de Dan Kubb dan.kubb@autopilotmarketing.com