tmbundle.patch @@ -23,17 +23,25 @@ module Spec case parent when 'lib', 'app' then - path = path.gsub(/\/app\//, "/spec/") - path = path.gsub(/\/lib\//, "/spec/") + if rails?(prefix) + path = path.gsub(/\/app\//, "/spec/") + path = path.gsub(/\/lib\//, "/spec/lib/") + else + path = path.gsub(/\/lib\//, "/spec/") + end path = path.gsub(/\.rb$/, "_spec.rb") path = path.gsub(/\.erb$/, ".erb_spec.rb") path = path.gsub(/\.rhtml$/, ".rhtml_spec.rb") when 'spec' then - new_parent = rails?(prefix) ? "app" : "lib" path = path.gsub(/\.rhtml_spec\.rb$/, ".rhtml") path = path.gsub(/\.erb_spec\.rb$/, ".erb") path = path.gsub(/_spec\.rb$/, ".rb") - path = path.gsub(/\/spec\//, "/#{new_parent}/") + if rails?(prefix) + path = path.gsub(/\/spec\/lib\//, "/lib/") + path = path.gsub(/\/spec\//, "/app/") + else + path = path.gsub(/\/spec\//, "/lib/") + end end return path end RSpec.tmbundle/Support/lib/spec/mate/switch_command.rb @@ -137,6 +137,11 @@ EOF "/a/full/path/spec/views/mooky/show.rhtml_spec.rb") end + it "should work with lib dir in rails" do + "/a/full/path/lib/foo/mooky.rb".should twin( + "/a/full/path/spec/lib/foo/mooky_spec.rb") + end + it "should suggest controller spec" do "/a/full/path/spec/controllers/mooky_controller_spec.rb".should be_a("controller spec") end RSpec.tmbundle/Support/spec/spec/mate/switch_command_spec.rb @@ -291,6 +291,7 @@ In alphabetical order (by last name) ** Patch LH[#271] Since @template.finder, isolation mode doesn't work ** Patch for [#11545] Rspec doesn't handle should_receive on ActiveRecord associations * Mike Williams +** Patch LH[#276] to support the lib directory in rails apps with the Textmate Alternate File command. ** Core patches for arbitrary comparisons like 5.should_be < 6 * Chad Wooley ** Patch to mocks to make it possible to specify raised exception instance doc/src/community/index.page @@ -1,5 +1,6 @@ == Version 1.1.4 (trunk) +* Applied patch from Mike Williams to support the lib directory in rails apps with the Textmate Alternate File command. Closes #276. * Applied patch from Bob Cotton: Nested ExampleGroups do not have a spec_path. Closes #224. * Applied patch from Wincent Colaiuta to invert sense of "spec --diff". Closes #281. * Allow any type of render in view specs. Closes #57. rspec/CHANGES 09e5a68667dd714f04db451b6a861df6e633531d dchelimsky dchelimsky@410327ef-2207-0410-a325-f78bbcb22a5a http://github.com/jdelStrother/rspec/commit/6f68f058d8974a29509948a8d9f06438bba49380 6f68f058d8974a29509948a8d9f06438bba49380 2008-02-11T17:09:30-08:00 2008-02-11T17:09:30-08:00 Applied patch from Mike Williams to support the lib directory in rails apps with the Textmate Alternate File command. Closes #276. git-svn-id: svn+ssh://rubyforge.org/var/svn/rspec/trunk@3299 410327ef-2207-0410-a325-f78bbcb22a5a 536ad083046ba951de5d29257178c5ce5a3a9a36 dchelimsky dchelimsky@410327ef-2207-0410-a325-f78bbcb22a5a