rspec-core 2.7.1 → 2.8.0.rc1

data/spec/autotest/failed_results_re_spec.rb

@@ -3,13 +3,13 @@ require "spec_helper"
 describe "failed_results_re for autotest" do
   def run_example
     group = RSpec::Core::ExampleGroup.describe("group")
-    example = group.example("example") { yield }
+    group.example("example") { yield }
     io = StringIO.new
     formatter = RSpec::Core::Formatters::BaseTextFormatter.new(io)
     reporter = RSpec::Core::Reporter.new(formatter)
 
     group.run(reporter)
-    reporter.report(1) {}
+    reporter.report(1, nil) {}
     io.string
   end
 

data/spec/command_line/order_spec.rb

@@ -0,0 +1,131 @@
+require 'spec_helper'
+
+describe 'command line', :ui do
+  before :all do
+    write_file 'spec/order_spec.rb', """
+      describe 'group 1' do
+        specify('group 1 example 1')  {}
+        specify('group 1 example 2')  {}
+        specify('group 1 example 3')  {}
+        specify('group 1 example 4')  {}
+        specify('group 1 example 5')  {}
+        specify('group 1 example 6')  {}
+        specify('group 1 example 5')  {}
+        specify('group 1 example 7')  {}
+        specify('group 1 example 8')  {}
+        specify('group 1 example 9')  {}
+        specify('group 1 example 10') {}
+
+        describe 'group 1-1' do
+          specify('group 1-1 example 1')  {}
+          specify('group 1-1 example 2')  {}
+          specify('group 1-1 example 3')  {}
+          specify('group 1-1 example 4')  {}
+          specify('group 1-1 example 5')  {}
+          specify('group 1-1 example 6')  {}
+          specify('group 1-1 example 7')  {}
+          specify('group 1-1 example 8')  {}
+          specify('group 1-1 example 9')  {}
+          specify('group 1-1 example 10') {}
+        end
+
+        describe('group 1-2')  { specify('example') {} }
+        describe('group 1-3')  { specify('example') {} }
+        describe('group 1-4')  { specify('example') {} }
+        describe('group 1-5')  { specify('example') {} }
+        describe('group 1-6')  { specify('example') {} }
+        describe('group 1-7')  { specify('example') {} }
+        describe('group 1-8')  { specify('example') {} }
+        describe('group 1-9')  { specify('example') {} }
+        describe('group 1-10') { specify('example') {} }
+      end
+
+      describe('group 2')  { specify('example') {} }
+      describe('group 3')  { specify('example') {} }
+      describe('group 4')  { specify('example') {} }
+      describe('group 5')  { specify('example') {} }
+      describe('group 6')  { specify('example') {} }
+      describe('group 7')  { specify('example') {} }
+      describe('group 8')  { specify('example') {} }
+      describe('group 9')  { specify('example') {} }
+      describe('group 10') { specify('example') {} }
+    """
+  end
+
+  describe '--order rand' do
+    it 'runs the examples and groups in a different order each time' do
+      2.times { run_command 'rspec spec/order_spec.rb --order rand -f doc' }
+
+      all_output.should match(/Randomized with seed \d+/)
+
+      top_level_groups      {|first_run, second_run| first_run.should_not eq(second_run)}
+      nested_groups         {|first_run, second_run| first_run.should_not eq(second_run)}
+      examples('group 1')   {|first_run, second_run| first_run.should_not eq(second_run)}
+      examples('group 1-1') {|first_run, second_run| first_run.should_not eq(second_run)}
+    end
+  end
+
+  describe '--order rand:SEED' do
+    it 'runs the examples and groups in the same order each time' do
+      2.times { run_command 'rspec spec/order_spec.rb --order rand:123 -f doc' }
+
+      all_output.should match(/Randomized with seed 123/)
+
+      top_level_groups      {|first_run, second_run| first_run.should eq(second_run)}
+      nested_groups         {|first_run, second_run| first_run.should eq(second_run)}
+      examples('group 1')   {|first_run, second_run| first_run.should eq(second_run)}
+      examples('group 1-1') {|first_run, second_run| first_run.should eq(second_run)}
+    end
+  end
+
+  describe '--seed SEED' do
+    it "forces '--order rand' and runs the examples and groups in the same order each time" do
+      2.times { run_command 'rspec spec/order_spec.rb --seed 123 -f doc' }
+
+      all_output.should match(/Randomized with seed \d+/)
+
+      top_level_groups      {|first_run, second_run| first_run.should eq(second_run)}
+      nested_groups         {|first_run, second_run| first_run.should eq(second_run)}
+      examples('group 1')   {|first_run, second_run| first_run.should eq(second_run)}
+      examples('group 1-1') {|first_run, second_run| first_run.should eq(second_run)}
+    end
+  end
+
+  describe '--order default on CLI with --order rand in .rspec' do
+    it "overrides --order rand with --order default" do
+      write_file '.rspec', '--order rand'
+
+      run_command 'rspec spec/order_spec.rb --order default -f doc'
+
+      all_output.should_not match(/Randomized/)
+
+      all_output.should match(/group 1.*group 1 example 1.*group 1 example 2.*group 1-1.*group 1-2.*group 2.*/m)
+    end
+  end
+
+  def examples(group)
+    yield split_in_half(all_stdout.scan(/^\s+#{group} example.*$/))
+  end
+
+  def top_level_groups
+    yield example_groups_at_level(0)
+  end
+
+  def nested_groups
+    yield example_groups_at_level(2)
+  end
+
+  def example_groups_at_level(level)
+    split_in_half(all_stdout.scan(/^\s{#{level*2}}group.*$/))
+  end
+
+  def split_in_half(array)
+    length, midpoint = array.length, array.length / 2
+    return array.slice(0, midpoint), array.slice(midpoint, length)
+  end
+
+  def run_command(cmd)
+    # Wraps aruba api - 2nd param is fail_on_error
+    run_simple cmd, false
+  end
+end

data/spec/rspec/core/command_line_spec.rb

@@ -95,7 +95,8 @@ module RSpec::Core
         # this is necessary to ensure that color works correctly on windows
         config.should_receive(:error_stream=).ordered
         config.should_receive(:output_stream=).ordered
-        config.should_receive(:color_enabled=).ordered
+        config.should_receive(:force).with(:default_path => anything).ordered
+        config.should_receive(:force).with(:color => true).ordered
         command_line.run(err, out) rescue nil
       end
 

data/spec/rspec/core/configuration_options_spec.rb

@@ -1,18 +1,8 @@
 require 'spec_helper'
 require 'ostruct'
-require 'tmpdir'
 
 describe RSpec::Core::ConfigurationOptions do
-
-  def config_options_object(*args)
-    coo = RSpec::Core::ConfigurationOptions.new(args)
-    coo.parse_options
-    coo
-  end
-
-  def parse_options(*args)
-    config_options_object(*args).options
-  end
+  include ConfigOptionsHelper
 
   it "warns when HOME env var is not set", :unless => (RUBY_PLATFORM == 'java') do
     begin
@@ -45,7 +35,7 @@ describe RSpec::Core::ConfigurationOptions do
     it "sends default_path before files_or_directories_to_run" do
       opts = config_options_object(*%w[--default_path spec])
       config = double("config").as_null_object
-      config.should_receive(:default_path=).ordered
+      config.should_receive(:force).with(:default_path => 'spec').ordered
       config.should_receive(:files_or_directories_to_run=).ordered
       opts.configure(config)
     end
@@ -53,7 +43,7 @@ describe RSpec::Core::ConfigurationOptions do
     it "sends pattern before files_or_directories_to_run" do
       opts = config_options_object(*%w[--pattern **/*.spec])
       config = double("config").as_null_object
-      config.should_receive(:pattern=).ordered
+      config.should_receive(:force).with(:pattern => '**/*.spec').ordered
       config.should_receive(:files_or_directories_to_run=).ordered
       opts.configure(config)
     end
@@ -64,27 +54,81 @@ describe RSpec::Core::ConfigurationOptions do
       opts.configure(config)
       config.exclusion_filter.should have_key(:slow)
     end
+
+    it "forces color_enabled" do
+      opts = config_options_object(*%w[--color])
+      config = RSpec::Core::Configuration.new
+      config.should_receive(:force).with(:color => true)
+      opts.configure(config)
+    end
+
+    it "assigns filter" do
+      pending
+    end
+
+    [
+      ["--failure-exit-code", "3", :failure_exit_code, 3 ],
+      ["--pattern", "foo/bar", :pattern, "foo/bar"],
+      ["--failure-exit-code", "37", :failure_exit_code, 37],
+      ["--default_path", "behavior", :default_path, "behavior"],
+      ["--drb", nil, :drb, true],
+      ["--drb-port", "37", :drb_port, 37],
+      ["--backtrace", nil, :full_backtrace, true],
+      ["--profile", nil, :profile_examples, true],
+      ["--tty", nil, :tty, true]
+    ].each do |cli_option, cli_value, config_key, config_value|
+      it "forces #{config_key}" do
+        opts = config_options_object(*[cli_option, cli_value].compact)
+        config = RSpec::Core::Configuration.new
+        config.should_receive(:force) do |pair|
+          pair.keys.first.should eq(config_key)
+          pair.values.first.should eq(config_value)
+        end
+        opts.configure(config)
+      end
+    end
+
+    it "sets order directly" do
+      opts = config_options_object("--order", "rand")
+      config = RSpec::Core::Configuration.new
+      opts.configure(config)
+      config.order.should eq("rand")
+    end
+
+    it "sets seed directly" do
+      opts = config_options_object("--seed", "37")
+      config = RSpec::Core::Configuration.new
+      opts.configure(config)
+      config.seed.should eq(37)
+    end
+
+    it "sets debug directly" do
+      opts = config_options_object("--debug")
+      config = RSpec::Core::Configuration.new
+      config.should_receive(:debug=).with(true)
+      opts.configure(config)
+    end
   end
 
   describe "-c, --color, and --colour" do
-    it "sets :color_enabled => true" do
-      parse_options('-c').should include(:color_enabled => true)
-      parse_options('--color').should include(:color_enabled => true)
-      parse_options('--colour').should include(:color_enabled => true)
+    it "sets :color => true" do
+      parse_options('-c').should include(:color => true)
+      parse_options('--color').should include(:color => true)
+      parse_options('--colour').should include(:color => true)
     end
   end
 
   describe "--no-color" do
-    it "sets :color_enabled => false" do
-      parse_options('--no-color').should include(:color_enabled => false)
+    it "sets :color => false" do
+      parse_options('--no-color').should include(:color => false)
     end
 
-    it "overrides previous :color_enabled => true" do
-      parse_options('--color', '--no-color').should include(:color_enabled => false)
+    it "overrides previous :color => true" do
+      parse_options('--color', '--no-color').should include(:color => false)
     end
 
-    it "gets overriden by a subsequent :color_enabled => true" do
-      parse_options('--no-color', '--color').should include(:color_enabled => true)
+    it "gets overriden by a subsequent :color => true" do
+      parse_options('--no-color', '--color').should include(:color => true)
     end
   end
 
@@ -204,15 +248,13 @@ describe RSpec::Core::ConfigurationOptions do
       end
 
       it "turns off the debugger option if --drb is specified in the options file" do
-        File.stub(:exist?) { true }
-        IO.stub(:read) { "--drb" }
+        File.open("./.rspec", "w") {|f| f << "--drb"}
         config_options_object("--debug").drb_argv.should_not include("--debug")
         config_options_object("-d"     ).drb_argv.should_not include("--debug")
       end
 
       it "turns off the debugger option if --debug is specified in the options file" do
-        File.stub(:exist?) { true }
-        IO.stub(:read) { "--debug" }
+        File.open("./.rspec", "w") {|f| f << "--debug"}
         config_options_object("--drb").drb_argv.should_not include("--debug")
         config_options_object("-X"   ).drb_argv.should_not include("--debug")
       end
@@ -265,145 +307,20 @@ describe RSpec::Core::ConfigurationOptions do
   describe "default_path" do
     it "gets set before files_or_directories_to_run" do
       config = double("config").as_null_object
-      config.should_receive(:default_path=).ordered
+      config.should_receive(:force).with(:default_path => 'foo').ordered
       config.should_receive(:files_or_directories_to_run=).ordered
       opts = config_options_object("--default_path", "foo")
       opts.configure(config)
     end
   end
 
-  # TODO ensure all options are output
-  describe "#drb_argv" do
-    it "preserves extra arguments" do
-      File.stub(:exist?) { false }
-      config_options_object(*%w[ a --drb b --color c ]).drb_argv.should =~ %w[ --color a b c ]
-    end
-
-    it "includes --fail-fast" do
-      config_options_object(*%w[--fail-fast]).drb_argv.should include("--fail-fast")
-    end
-
-    it "includes --options" do
-      config_options_object(*%w[--options custom.opts]).drb_argv.should include("--options", "custom.opts")
-    end
-
-    context "with --example" do
-      it "includes --example" do
-        config_options_object(*%w[--example foo]).drb_argv.should include("--example", "foo")
-      end
-
-      it "unescapes characters which were escaped upon storing --example originally" do
-        config_options_object("--example", "foo\\ bar").drb_argv.should include("--example", "foo bar")
-      end
-    end
-
-    context "with tags" do
-      it "includes the inclusion tags" do
-        coo = config_options_object("--tag", "tag")
-        coo.drb_argv.should eq(["--tag", "tag"])
-      end
-
-      it "leaves inclusion tags intact" do
-        coo = config_options_object("--tag", "tag")
-        coo.drb_argv
-        coo.options[:filter].should eq( {:tag=>true} )
-      end
-
-      it "includes the exclusion tags" do
-        coo = config_options_object("--tag", "~tag")
-        coo.drb_argv.should eq(["--tag", "~tag"])
-      end
-
-      it "leaves exclusion tags intact" do
-        coo = config_options_object("--tag", "~tag")
-        coo.drb_argv
-        coo.options[:exclusion_filter].should eq( {:tag=>true} )
-      end
-    end
-
-    context "with formatters" do
-      it "includes the formatters" do
-        coo = config_options_object("--format", "d")
-        coo.drb_argv.should eq(["--format", "d"])
-      end
-
-      it "leaves formatters intact" do
-        coo = config_options_object("--format", "d")
-        coo.drb_argv
-        coo.options[:formatters].should eq([["d"]])
-      end
-
-      it "leaves output intact" do
-        coo = config_options_object("--format", "p", "--out", "foo.txt", "--format", "d")
-        coo.drb_argv
-        coo.options[:formatters].should eq([["p","foo.txt"],["d"]])
-      end
-    end
-
-    context "--drb specified in ARGV" do
-      it "renders all the original arguments except --drb" do
-        config_options_object(*%w[ --drb --color --format s --example pattern --line_number 1 --profile --backtrace -I path/a -I path/b --require path/c --require path/d]).
-          drb_argv.should eq(%w[ --color --profile --backtrace --example pattern --line_number 1 --format s -I path/a -I path/b --require path/c --require path/d])
-      end
-    end
-
-    context "--drb specified in the options file" do
-      it "renders all the original arguments except --drb" do
-        File.stub(:exist?) { true }
-        IO.stub(:read) { "--drb --color" }
-        config_options_object(*%w[ --tty --format s --example pattern --line_number 1 --profile --backtrace ]).
-          drb_argv.should eq(%w[ --color --profile --backtrace --tty --example pattern --line_number 1 --format s])
-      end
-    end
-
-    context "--drb specified in ARGV and the options file" do
-      it "renders all the original arguments except --drb" do
-        File.stub(:exist?) { true }
-        IO.stub(:read) { "--drb --color" }
-        config_options_object(*%w[ --drb --format s --example pattern --line_number 1 --profile --backtrace]).
-          drb_argv.should eq(%w[ --color --profile --backtrace --example pattern --line_number 1 --format s])
-      end
-    end
-
-    context "--drb specified in ARGV and in as ARGV-specified --options file" do
-      it "renders all the original arguments except --drb and --options" do
-        File.stub(:exist?) { true }
-        IO.stub(:read) { "--drb --color" }
-        config_options_object(*%w[ --drb --format s --example pattern --line_number 1 --profile --backtrace]).
-          drb_argv.should eq(%w[ --color --profile --backtrace --example pattern --line_number 1 --format s ])
-      end
-    end
-  end
-
   describe "sources: ~/.rspec, ./.rspec, custom, CLI, and SPEC_OPTS" do
-    let(:local_options_file)  { File.join(Dir.tmpdir, ".rspec-local") }
-    let(:global_options_file) { File.join(Dir.tmpdir, ".rspec-global") }
-    let(:custom_options_file) { File.join(Dir.tmpdir, "custom.options") }
-
-    before do
-      @orig_spec_opts = ENV["SPEC_OPTS"]
-      RSpec::Core::ConfigurationOptions::send :public, :global_options_file
-      RSpec::Core::ConfigurationOptions::send :public, :local_options_file
-      RSpec::Core::ConfigurationOptions::any_instance.stub(:global_options_file) { global_options_file }
-      RSpec::Core::ConfigurationOptions::any_instance.stub(:local_options_file) { local_options_file }
-    end
-
-    after do
-      ENV["SPEC_OPTS"] = @orig_spec_opts
-      RSpec::Core::ConfigurationOptions::send :private, :global_options_file
-      RSpec::Core::ConfigurationOptions::send :private, :local_options_file
-    end
-
-    def write_options(scope, options)
-      File.open(send("#{scope}_options_file"), 'w') { |f| f.write(options) }
-    end
-
     it "merges global, local, SPEC_OPTS, and CLI" do
-      write_options(:global, "--color")
-      write_options(:local,  "--line 37")
+      File.open("./.rspec", "w") {|f| f << "--line 37"}
+      File.open("~/.rspec", "w") {|f| f << "--color"}
       ENV["SPEC_OPTS"] = "--debug"
       options = parse_options("--drb")
-      options[:color_enabled].should be_true
+      options[:color].should be_true
       options[:line_numbers].should eq(["37"])
       options[:debug].should be_true
       options[:drb].should be_true
@@ -415,22 +332,25 @@ describe RSpec::Core::ConfigurationOptions do
     end
 
     it "prefers CLI over file options" do
-      write_options(:local,  "--format local")
-      write_options(:global, "--format global")
+      File.open("./.rspec", "w") {|f| f << "--format local"}
+      File.open("~/.rspec", "w") {|f| f << "--format global"}
       parse_options("--format", "cli")[:formatters].should eq([['cli']])
     end
 
     it "prefers local file options over global" do
-      write_options(:local,  "--format local")
-      write_options(:global, "--format global")
+      File.open("./.rspec", "w") {|f| f << "--format local"}
+      File.open("~/.rspec", "w") {|f| f << "--format global"}
       parse_options[:formatters].should eq([['local']])
     end
 
     context "with custom options file" do
       it "ignores local and global options files" do
-        write_options(:local, "--color")
-        write_options(:global, "--color")
-        parse_options("-O", custom_options_file)[:color_enabled].should be_false
+        File.open("./.rspec", "w") {|f| f << "--format local"}
+        File.open("~/.rspec", "w") {|f| f << "--format global"}
+        File.open("./custom.opts", "w") {|f| f << "--color"}
+        options = parse_options("-O", "./custom.opts")
+        options[:format].should be_nil
+        options[:color].should be_true
       end
     end
   end