rspec-core 2.8.0.rc1 → 2.8.0.rc2

data/lib/rspec/core/version.rb

@@ -1,7 +1,7 @@
 module RSpec
   module Core
     module Version
-      STRING = '2.8.0.rc1'
+      STRING = '2.8.0.rc2'
     end
   end
 end

data/lib/rspec/monkey.rb

@@ -1 +1 @@
-require "rspec/monkey/spork/test_framework/rspec.rb"
+require_rspec 'monkey/spork/test_framework/rspec.rb'

data/lib/rspec/monkey/spork/test_framework/rspec.rb

@@ -1,6 +1,8 @@
 # TODO (2011-05-08) - remove this as soon as spork 0.9.0 is released
 if defined?(Spork::TestFramework::RSpec)
+  # @private
   class Spork::TestFramework::RSpec < Spork::TestFramework
+    # @private
     def run_tests(argv, err, out)
       ::RSpec::Core::CommandLine.new(argv).run(err, out)
     end

data/spec/command_line/order_spec.rb

@@ -1,6 +1,9 @@
 require 'spec_helper'
 
 describe 'command line', :ui do
+  let(:stderr) { StringIO.new }
+  let(:stdout) { StringIO.new }
+
   before :all do
     write_file 'spec/order_spec.rb', """
       describe 'group 1' do
@@ -54,9 +57,11 @@ describe 'command line', :ui do
 
   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' }
+      run_command 'tmp/aruba/spec/order_spec.rb --order rand -f doc'
+      RSpec.configuration.seed = srand && srand # reset seed in same process
+      run_command 'tmp/aruba/spec/order_spec.rb --order rand -f doc'
 
-      all_output.should match(/Randomized with seed \d+/)
+      stdout.string.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)}
@@ -67,9 +72,9 @@ describe 'command line', :ui do
 
   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' }
+      2.times { run_command 'tmp/aruba/spec/order_spec.rb --order rand:123 -f doc' }
 
-      all_output.should match(/Randomized with seed 123/)
+      stdout.string.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)}
@@ -80,9 +85,9 @@ describe 'command line', :ui do
 
   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' }
+      2.times { run_command 'tmp/aruba/spec/order_spec.rb --seed 123 -f doc' }
 
-      all_output.should match(/Randomized with seed \d+/)
+      stdout.string.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)}
@@ -95,16 +100,18 @@ describe 'command line', :ui 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'
+      run_command 'tmp/aruba/spec/order_spec.rb --order default -f doc'
 
-      all_output.should_not match(/Randomized/)
+      stdout.string.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)
+      stdout.string.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.*$/))
+    yield split_in_half(stdout.string.scan(/^\s+#{group} example.*$/))
   end
 
   def top_level_groups
@@ -116,7 +123,7 @@ describe 'command line', :ui do
   end
 
   def example_groups_at_level(level)
-    split_in_half(all_stdout.scan(/^\s{#{level*2}}group.*$/))
+    split_in_half(stdout.string.scan(/^\s{#{level*2}}group.*$/))
   end
 
   def split_in_half(array)
@@ -125,7 +132,6 @@ describe 'command line', :ui do
   end
 
   def run_command(cmd)
-    # Wraps aruba api - 2nd param is fail_on_error
-    run_simple cmd, false
+    RSpec::Core::Runner.run(cmd.split, stderr, stdout)
   end
 end

data/spec/rspec/core/command_line_spec.rb

@@ -22,19 +22,16 @@ module RSpec::Core
       end
 
       it "returns 0 if spec passes" do
-        err, out = StringIO.new, StringIO.new
         result = command_line([passing_spec_filename]).run(err, out)
         result.should be(0)
       end
 
       it "returns 1 if spec fails" do
-        err, out = StringIO.new, StringIO.new
         result = command_line([failing_spec_filename]).run(err, out)
         result.should be(1)
       end
 
       it "returns 2 if spec fails and --failure-exit-code is 2" do
-        err, out = StringIO.new, StringIO.new
         result = command_line([failing_spec_filename, "--failure-exit-code", "2"]).run(err, out)
         result.should be(2)
       end
@@ -95,8 +92,7 @@ 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(:force).with(:default_path => anything).ordered
-        config.should_receive(:force).with(:color => true).ordered
+        config.should_receive(:force).any_number_of_times.ordered
         command_line.run(err, out) rescue nil
       end
 

data/spec/rspec/core/configuration_options_spec.rb

@@ -48,6 +48,13 @@ describe RSpec::Core::ConfigurationOptions do
       opts.configure(config)
     end
 
+    it "assigns inclusion_filter" do
+      opts = config_options_object(*%w[--tag awesome])
+      config = RSpec::Core::Configuration.new
+      opts.configure(config)
+      config.inclusion_filter.should have_key(:awesome)
+    end
+
     it "merges the :exclusion_filter option with the default exclusion_filter" do
       opts = config_options_object(*%w[--tag ~slow])
       config = RSpec::Core::Configuration.new
@@ -62,16 +69,14 @@ describe RSpec::Core::ConfigurationOptions do
       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],
+      ["--order", "rand", :order, "rand"],
+      ["--seed", "37", :order, "rand:37"],
       ["--drb-port", "37", :drb_port, 37],
       ["--backtrace", nil, :full_backtrace, true],
       ["--profile", nil, :profile_examples, true],
@@ -88,20 +93,6 @@ describe RSpec::Core::ConfigurationOptions do
       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
@@ -152,9 +143,9 @@ describe RSpec::Core::ConfigurationOptions do
 
   describe "--format, -f" do
     it "sets :formatter" do
-      parse_options('--format', 'd').should include(:formatters => [['d']])
-      parse_options('-f', 'd').should include(:formatters => [['d']])
-      parse_options('-fd').should include(:formatters => [['d']])
+      [['--format', 'd'], ['-f', 'd'], '-fd'].each do |args|
+        parse_options(*args).should include(:formatters => [['d']])
+      end
     end
 
     example "can accept a class name" do
@@ -283,7 +274,9 @@ describe RSpec::Core::ConfigurationOptions do
 
   describe "files_or_directories_to_run" do
     it "parses files from '-c file.rb dir/file.rb'" do
-      parse_options("-c", "file.rb", "dir/file.rb").should include(:files_or_directories_to_run => ["file.rb", "dir/file.rb"])
+      parse_options("-c", "file.rb", "dir/file.rb").should include(
+        :files_or_directories_to_run => ["file.rb", "dir/file.rb"]
+      )
     end
 
     it "parses dir from 'dir'" do
@@ -291,17 +284,15 @@ describe RSpec::Core::ConfigurationOptions do
     end
 
     it "parses dir and files from 'spec/file1_spec.rb, spec/file2_spec.rb'" do
-      parse_options("dir", "spec/file1_spec.rb", "spec/file2_spec.rb").should include(:files_or_directories_to_run => ["dir", "spec/file1_spec.rb", "spec/file2_spec.rb"])
+      parse_options("dir", "spec/file1_spec.rb", "spec/file2_spec.rb").should include(
+        :files_or_directories_to_run => ["dir", "spec/file1_spec.rb", "spec/file2_spec.rb"]
+      )
     end
 
     it "provides no files or directories if spec directory does not exist" do
       FileTest.stub(:directory?).with("spec").and_return false
       parse_options().should include(:files_or_directories_to_run => [])
     end
-
-    it "parses dir and files from 'spec/file1_spec.rb, spec/file2_spec.rb'" do
-      parse_options("dir", "spec/file1_spec.rb", "spec/file2_spec.rb").should include(:files_or_directories_to_run => ["dir", "spec/file1_spec.rb", "spec/file2_spec.rb"])
-    end
   end
 
   describe "default_path" do
@@ -315,6 +306,10 @@ describe RSpec::Core::ConfigurationOptions do
   end
 
   describe "sources: ~/.rspec, ./.rspec, custom, CLI, and SPEC_OPTS" do
+    before(:each) do
+      FileUtils.mkpath(File.expand_path("~"))
+    end
+
     it "merges global, local, SPEC_OPTS, and CLI" do
       File.open("./.rspec", "w") {|f| f << "--line 37"}
       File.open("~/.rspec", "w") {|f| f << "--color"}

data/spec/rspec/core/configuration_spec.rb

@@ -649,13 +649,6 @@ module RSpec::Core
         config.inclusion_filter[:foo].should be(true)
         config.inclusion_filter[:bar].should be(false)
       end
-
-      it "gets overrided by forced options" do
-        config.force_exclude :foo => true
-        config.filter_run_including :foo => true
-        config.inclusion_filter.should eq({})
-      end
-
     end
 
     describe "#filter_run_excluding" do
@@ -684,13 +677,6 @@ module RSpec::Core
         config.exclusion_filter[:foo].should be(true)
         config.exclusion_filter[:bar].should be(false)
       end
-
-      it "gets overrided by forced options" do
-        config.exclusion_filter.clear
-        config.force_include :foo => true
-        config.filter_run_excluding :foo => true
-        config.exclusion_filter.should eq({})
-      end
     end
 
     describe "#inclusion_filter" do
@@ -1035,6 +1021,38 @@ module RSpec::Core
       end
     end
 
+    describe "#force" do
+      it "forces order" do
+        config.force :order => "default"
+        config.order = "rand"
+        config.order.should eq("default")
+      end
+
+      it "forces order and seed with :order => 'rand:37'" do
+        config.force :order => "rand:37"
+        config.order = "default"
+        config.order.should eq("rand")
+        config.seed.should eq(37)
+      end
+
+      it "forces order and seed with :seed => '37'" do
+        config.force :seed => "37"
+        config.order = "default"
+        config.seed.should eq(37)
+        config.order.should eq("rand")
+      end
+
+      it "forces 'false' value" do
+        config.add_setting :custom_option
+        config.custom_option = true
+        config.custom_option?.should be_true
+        config.force :custom_option => false
+        config.custom_option?.should be_false
+        config.custom_option = true
+        config.custom_option?.should be_false
+      end
+    end
+
     describe '#seed' do
       it 'returns the seed as an int' do
         config.seed = '123'

data/spec/rspec/core/drb_command_line_spec.rb

@@ -7,23 +7,19 @@ describe "::DRbCommandLine", :type => :drb, :unless => RUBY_PLATFORM == 'java' d
 
   include_context "spec files"
 
-  def command_line(args)
-    RSpec::Core::DRbCommandLine.new(config_options(args))
+  def command_line(*args)
+    RSpec::Core::DRbCommandLine.new(config_options(*args))
   end
 
-  def config_options(argv=[])
-    options = RSpec::Core::ConfigurationOptions.new(argv)
+  def config_options(*args)
+    options = RSpec::Core::ConfigurationOptions.new(args)
     options.parse_options
     options
   end
 
-  def run_with(args)
-    command_line(args).run(err, out)
-  end
-
   context "without server running" do
     it "raises an error" do
-      lambda { run_with [] }.should raise_error(DRb::DRbConnError)
+      lambda { command_line.run(err, out) }.should raise_error(DRb::DRbConnError)
     end
   end
 
@@ -41,24 +37,23 @@ describe "::DRbCommandLine", :type => :drb, :unless => RUBY_PLATFORM == 'java' d
     context "without RSPEC_DRB environment variable set" do
       it "defaults to 8989" do
         with_RSPEC_DRB_set_to(nil) do
-          command_line([]).drb_port.should eq(8989)
+          command_line.drb_port.should eq(8989)
         end
       end
 
       it "sets the DRb port" do
         with_RSPEC_DRB_set_to(nil) do
-          command_line(["--drb-port", "1234"]).drb_port.should eq(1234)
-          command_line(["--drb-port", "5678"]).drb_port.should eq(5678)
+          command_line("--drb-port", "1234").drb_port.should eq(1234)
+          command_line("--drb-port", "5678").drb_port.should eq(5678)
         end
       end
     end
 
     context "with RSPEC_DRB environment variable set" do
-
       context "without config variable set" do
         it "uses RSPEC_DRB value" do
           with_RSPEC_DRB_set_to('9000') do
-            command_line([]).drb_port.should eq("9000")
+            command_line.drb_port.should eq("9000")
           end
         end
       end
@@ -66,7 +61,7 @@ describe "::DRbCommandLine", :type => :drb, :unless => RUBY_PLATFORM == 'java' d
       context "and config variable set" do
         it "uses configured value" do
           with_RSPEC_DRB_set_to('9000') do
-            command_line(%w[--drb-port 5678]).drb_port.should eq(5678)
+            command_line(*%w[--drb-port 5678]).drb_port.should eq(5678)
           end
         end
       end
@@ -74,7 +69,7 @@ describe "::DRbCommandLine", :type => :drb, :unless => RUBY_PLATFORM == 'java' d
   end
 
   context "with server running" do
-    class ::FakeDrbSpecServer
+    class SimpleDRbSpecServer
       def self.run(argv, err, out)
         options = RSpec::Core::ConfigurationOptions.new(argv)
         options.parse_options
@@ -83,9 +78,9 @@ describe "::DRbCommandLine", :type => :drb, :unless => RUBY_PLATFORM == 'java' d
     end
 
     before(:all) do
-      @drb_port = 8990
+      @drb_port = '8990'
       @drb_example_file_counter = 0
-      DRb::start_service("druby://127.0.0.1:#{@drb_port}", ::FakeDrbSpecServer)
+      DRb::start_service("druby://127.0.0.1:#{@drb_port}", SimpleDRbSpecServer)
     end
 
     after(:all) do
@@ -93,32 +88,20 @@ describe "::DRbCommandLine", :type => :drb, :unless => RUBY_PLATFORM == 'java' d
     end
 
     it "returns 0 if spec passes" do
-      err, out = StringIO.new, StringIO.new
-      result = command_line(["--drb-port", @drb_port.to_s, passing_spec_filename]).run(err, out)
+      result = command_line("--drb-port", @drb_port, passing_spec_filename).run(err, out)
       result.should be(0)
     end
 
-    it "returns 1 if spec passes" do
-      err, out = StringIO.new, StringIO.new
-      result = command_line(["--drb-port", @drb_port.to_s, failing_spec_filename]).run(err, out)
+    it "returns 1 if spec fails" do
+      result = command_line("--drb-port", @drb_port, failing_spec_filename).run(err, out)
       result.should be(1)
     end
 
-    def run_spec_via_druby
-      run_with([failing_spec_filename, "--colour", "--drb-port", @drb_port.to_s])
+    it "outputs colorized text when running with --colour option" do
+      pending "figure out a way to tell the output to say it's tty"
+      command_line(failing_spec_filename, "--color", "--drb-port", @drb_port).run(err, out)
       out.rewind
-      out.read
-    end
-
-    it "outputs green colorized text when running with --colour option" do
-      pending "figure out a way to properly sandbox this"
-      run_spec_via_druby.should =~ /\e\[32m/m
-    end
-
-    it "outputs red colorized text when running with -c option" do
-      pending "figure out a way to properly sandbox this"
-      run_spec_via_druby.should =~ /\e\[31m/m
+      out.read.should =~ /\e\[31m/m
     end
   end
-
 end

data/spec/rspec/core/drb_options_spec.rb

@@ -3,15 +3,20 @@ require "spec_helper"
 describe RSpec::Core::DrbOptions do
   include ConfigOptionsHelper
 
-  # 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")
+    %w(--color --fail-fast --profile --backtrace --tty).each do |option|
+      it "includes #{option}" do
+        config_options_object("#{option}").drb_argv.should include("#{option}")
+      end
+    end
+
+    it "includes --failure-exit-code" do
+      config_options_object(*%w[--failure-exit-code 2]).drb_argv.should include("--failure-exit-code", "2")
     end
 
     it "includes --options" do
@@ -97,6 +102,49 @@ describe RSpec::Core::DrbOptions do
       end
     end
 
+    context "with --out" do
+      it "combines with formatters" do
+        coo = config_options_object(*%w[--format h --out report.html])
+        coo.drb_argv.should       eq(%w[--format h --out report.html])
+      end
+    end
+
+    context "with --line_number" do
+      it "includes --line_number" do
+        config_options_object(*%w[--line_number 35]).drb_argv.should eq(%w[--line_number 35])
+      end
+
+      it "includes multiple lines" do
+        config_options_object(*%w[-l 90 -l 4 -l 55]).drb_argv.should eq(
+          %w[--line_number 90 --line_number 4 --line_number 55]
+        )
+      end
+    end
+
+    context "with -I libs" do
+      it "includes -I" do
+        config_options_object(*%w[-I a_dir]).drb_argv.should eq(%w[-I a_dir])
+      end
+
+      it "includes multiple paths" do
+        config_options_object(*%w[-I dir_1 -I dir_2 -I dir_3]).drb_argv.should eq(
+                               %w[-I dir_1 -I dir_2 -I dir_3]
+        )
+      end
+    end
+
+    context "with --require" do
+      it "includes --require" do
+        config_options_object(*%w[--require a_path]).drb_argv.should eq(%w[--require a_path])
+      end
+
+      it "includes multiple paths" do
+        config_options_object(*%w[--require dir/ --require file.rb]).drb_argv.should eq(
+                               %w[--require dir/ --require file.rb]
+        )
+      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]).