@@ -61,7 +61,7 @@ module Spec "If this option is used it must come before the others"], :backtrace => ["-b", "--backtrace", "Output full backtrace"], :loadby => ["-L", "--loadby STRATEGY", "Specify the strategy by which spec files should be loaded.", - "STRATEGY can currently only be 'mtime' (File modification time)", + "STRATEGY can currently be 'mtime' (File modification time) or random", "By default, spec files are loaded in alphabetical order if --loadby", "is not specified."], :reverse => ["-R", "--reverse", "Run examples in reverse order"], rspec/lib/spec/runner/option_parser.rb @@ -2,7 +2,8 @@ module Spec module Runner class Options FILE_SORTERS = { - 'mtime' => lambda {|file_a, file_b| File.mtime(file_b) <=> File.mtime(file_a)} + 'mtime' => lambda {|file_a, file_b| File.mtime(file_b) <=> File.mtime(file_a)}, + 'random' => lambda {|file_a, file_b| rand <=> rand } } EXAMPLE_FORMATTERS = { # Load these lazily for better speed rspec/lib/spec/runner/options.rb @@ -355,6 +355,23 @@ describe "OptionParser" do end end + it "should accept the random comparator when --loadby random" do + options = parse(["--loadby", "random"]) + options.class.should_receive(:rand).and_return(0.2, 0.1) + + runner = Spec::Runner::ExampleGroupRunner.new(options) + Spec::Runner::ExampleGroupRunner.should_receive(:new). + with(options). + and_return(runner) + runner.should_receive(:load_files).with(["option_parser_spec.rb", "command_line_spec.rb"]) + + Dir.chdir(File.dirname(__FILE__)) do + options.files << 'command_line_spec.rb' + options.files << 'option_parser_spec.rb' + options.run_examples + end + end + it "should use the standard runner by default" do runner = ::Spec::Runner::ExampleGroupRunner.new(@parser.options) ::Spec::Runner::ExampleGroupRunner.should_receive(:new). rspec/spec/spec/runner/option_parser_spec.rb cd2176712f8575d1e69f29a9a315f707074f7cd5 Sean Geoghegan seangeo@gmail.com http://github.com/seangeo/rspec/commit/b7520eac216d6c26bdd3f0154260212944252911 b7520eac216d6c26bdd3f0154260212944252911 2008-04-02T02:14:36-07:00 2008-04-02T02:09:42-07:00 Added --loadby random option that randomizes the test order. 455db6daa883032155d508329ab2a5c3f8366f89 Sean Geoghegan seangeo@gmail.com