@@ -8,7 +8,13 @@ Autotest.add_hook :initialize do |at| filename } at.add_mapping(%r%^lib/(.*)\.rb$%) { |_, m| - ["spec/#{m[1]}_spec.rb"] + # two match entries to handle differences + # in directory structure: + # e.g lib/file.rb => spec/file_spec.rb - or - + # lib/module/file.rb => spec/file_spec.rb + path1 = m[1] + path2 = m[1].split('/')[1..-1].join('/') + ["spec/#{path1}_spec.rb", "spec/#{path2}_spec.rb"] } at.add_mapping(%r%^spec/(spec_helper|shared/.*)\.rb$%) { at.files_matching %r%^spec/.*_spec\.rb$% lib/autotest/rspec.rb @@ -82,14 +82,16 @@ HERE describe "mappings" do before(:each) do - @lib_file = "lib/something.rb" + @lib_files = ["lib/something.rb", "lib/module/something.rb"] @spec_file = "spec/something_spec.rb" @rspec_autotest = Rspec.new @rspec_autotest.hook :initialize end it "should find the spec file for a given lib file" do - @rspec_autotest.should map_specs([@spec_file]).to(@lib_file) + @lib_files.each do |lib_file| + @rspec_autotest.should map_specs([@spec_file]).to(lib_file) + end end it "should find the spec file if given a spec file" do spec/autotest/rspec_spec.rb 466b8e27e36bb0e6073a460f01341882ee881d8c John-Mason P. Shackelford jpshack@gmail.com http://github.com/jpshackelford/rspec/commit/ac02c42058334f043ae948288e08a40ae37b7446 ac02c42058334f043ae948288e08a40ae37b7446 2008-08-22T12:57:15-07:00 2008-08-22T12:57:15-07:00 Autotest extension now supports lib/module convention. See LightHouse #506 6fceb4dc0a439218e14754eb237b9d28c46c849a John-Mason P. Shackelford jpshack@gmail.com