@@ -37,7 +37,8 @@ class Autotest::Rspec < Autotest def make_test_cmd(files_to_test) return '' if files_to_test.empty? - return "#{ruby} -S #{files_to_test.keys.flatten.join(' ')} #{add_options_if_present}" + spec_program = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'bin', 'spec')) + return "#{ruby} #{spec_program} #{files_to_test.keys.flatten.join(' ')} #{add_options_if_present}" end def add_options_if_present # :nodoc: lib/autotest/rspec.rb @@ -60,6 +60,7 @@ HERE @rspec_autotest.stub!(:add_options_if_present).and_return "-O spec/spec.opts" @ruby = @rspec_autotest.ruby + @spec_cmd = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'bin', 'spec')) @options = @rspec_autotest.add_options_if_present @files_to_test = { :spec => ["file_one", "file_two"] @@ -71,7 +72,7 @@ HERE end it "should make the appropriate test command" do - @rspec_autotest.make_test_cmd(@files_to_test).should == "#{@ruby} -S #{@to_test} #{@options}" + @rspec_autotest.make_test_cmd(@files_to_test).should == "#{@ruby} #{@spec_cmd} #{@to_test} #{@options}" end it "should return a blank command for no files" do spec/autotest/rspec_spec.rb 7bdda7dfddd7060cecc260101bc4fe578e9dcf7b raggi jftucker@gmail.com http://github.com/raggi/rspec/commit/2538636794e7a27f62065b6a19ddbdc1cec38f5e 2538636794e7a27f62065b6a19ddbdc1cec38f5e 2008-11-05T06:22:57-08:00 2008-11-05T06:22:57-08:00 Removed incorrect -S flag on autospec commands. Added explicit spec command for ruby to run, guarantee running rspec, even if spec files are very wrong. (closes #507 (http://rspec.lighthouseapp.com/projects/5645-rspec/tickets/507-removal-of-spec-command-in-autotest-breaks-windows)) 5aca6b5b40c2df6bac1c10388c4742f7ea37dc40 raggi jftucker@gmail.com