rspec-core 2.11.1 → 2.12.0

data/spec/rspec/core/formatters/text_mate_formatter_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'spec_helper'
 require 'rspec/core/formatters/text_mate_formatter'
 require 'nokogiri'
@@ -6,10 +7,17 @@ module RSpec
   module Core
     module Formatters
       describe TextMateFormatter do
-        let(:jruby?) { ::RUBY_PLATFORM == 'java' }
-        let(:root)   { File.expand_path("#{File.dirname(__FILE__)}/../../../..") }
-        let(:suffix) { jruby? ? '-jruby' : '' }
+        let(:suffix) {
+          if ::RUBY_PLATFORM == 'java'
+            "-jruby"
+          elsif defined?(Rubinius)
+            "-rbx"
+          else
+            ""
+          end
+        }
 
+        let(:root) { File.expand_path("#{File.dirname(__FILE__)}/../../../..") }
         let(:expected_file) do
           "#{File.dirname(__FILE__)}/text_mate_formatted-#{::RUBY_VERSION}#{suffix}.html"
         end

data/spec/rspec/core/hooks_filtering_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 module RSpec::Core
   describe "config block hook filtering" do
     describe "unfiltered hooks" do
-      it "should be ran" do
+      it "is run" do
         filters = []
         RSpec.configure do |c|
           c.before(:all) { filters << "before all in config"}
@@ -28,7 +28,7 @@ module RSpec::Core
     describe "hooks with single filters" do
 
       context "with no scope specified" do
-        it "should be ran around|before|after :each if the filter matches the example group's filter" do
+        it "is run around|before|after :each if the filter matches the example group's filter" do
           filters = []
           RSpec.configure do |c|
             c.around(:match => true) {|example| filters << "around each in config"; example.run}
@@ -46,7 +46,7 @@ module RSpec::Core
         end
       end
 
-      it "should be ran if the filter matches the example group's filter" do
+      it "is run if the filter matches the example group's filter" do
         filters = []
         RSpec.configure do |c|
           c.before(:all,  :match => true) { filters << "before all in config"}
@@ -116,7 +116,7 @@ module RSpec::Core
         filters.should eq([:before_all, :after_all])
       end
 
-      it "should not be ran if the filter doesn't match the example group's filter" do
+      it "does not run if the filter doesn't match the example group's filter" do
         filters = []
         RSpec.configure do |c|
           c.before(:all,  :match => false) { filters << "before all in config"}
@@ -187,7 +187,7 @@ module RSpec::Core
     end
 
     describe "hooks with multiple filters" do
-      it "should be ran if all hook filters match the group's filters" do
+      it "is run if all hook filters match the group's filters" do
         filters = []
         RSpec.configure do |c|
           c.before(:all,  :one => 1)                         { filters << "before all in config"}
@@ -208,7 +208,7 @@ module RSpec::Core
         ])
       end
 
-      it "should not be ran if some hook filters don't match the group's filters" do
+      it "does not run if some hook filters don't match the group's filters" do
         filters = []
         RSpec.configure do |c|
           c.before(:all,  :one => 1, :four => 4)                         { filters << "before all in config"}

data/spec/rspec/core/metadata_spec.rb

@@ -4,6 +4,28 @@ module RSpec
   module Core
     describe Metadata do
 
+      describe '.relative_path' do
+        let(:here) { File.expand_path(".") }
+        it "transforms absolute paths to relative paths" do
+          Metadata.relative_path(here).should == "."
+        end
+        it "transforms absolute paths to relative paths anywhere in its argument" do
+          Metadata.relative_path("foo #{here} bar").should == "foo . bar"
+        end
+        it "returns nil if passed an unparseable file:line combo" do
+          Metadata.relative_path("-e:1").should be_nil
+        end
+        # I have no idea what line = line.sub(/\A([^:]+:\d+)$/, '\\1') is supposed to do
+        it "gracefully returns nil if run in a secure thread" do
+          safely do
+            value = Metadata.relative_path(".")
+            # on some rubies, File.expand_path is not a security error, so accept "." as well
+            [nil, "."].should include(value)
+          end
+        end
+
+      end
+
       describe "#process" do
         Metadata::RESERVED_KEYS.each do |key|
           it "prohibits :#{key} as a hash key" do
@@ -186,26 +208,32 @@ module RSpec
         let(:line_number)        { __LINE__ - 1 }
 
         it "stores the description" do
+          mfe.fetch(:description).should eq("example description")
           mfe[:description].should eq("example description")
         end
 
         it "stores the full_description (group description + example description)" do
+          mfe.fetch(:full_description).should eq("group description example description")
           mfe[:full_description].should eq("group description example description")
         end
 
         it "creates an empty execution result" do
+          mfe.fetch(:execution_result).should eq({})
           mfe[:execution_result].should eq({})
         end
 
         it "extracts file path from caller" do
+          mfe.fetch(:file_path).should eq(relative_path(__FILE__))
           mfe[:file_path].should eq(relative_path(__FILE__))
         end
 
         it "extracts line number from caller" do
+          mfe.fetch(:line_number).should eq(line_number)
           mfe[:line_number].should eq(line_number)
         end
 
         it "extracts location from caller" do
+          mfe.fetch(:location).should eq("#{relative_path(__FILE__)}:#{line_number}")
           mfe[:location].should eq("#{relative_path(__FILE__)}:#{line_number}")
         end
 
@@ -215,6 +243,7 @@ module RSpec
         end
 
         it "merges arbitrary options" do
+          mfe.fetch(:arbitrary).should eq(:options)
           mfe[:arbitrary].should eq(:options)
         end
 

data/spec/rspec/core/option_parser_spec.rb

@@ -15,6 +15,17 @@ module RSpec::Core
       parser.parse!([])
     end
 
+    it "proposes you to use --help and returns an error on incorrect argument" do
+      parser = Parser.new
+      option = "--my_wrong_arg"
+
+      parser.should_receive(:abort) do |msg|
+        expect(msg).to include('use --help', option)
+      end
+
+      parser.parse!([option])
+    end
+
     describe "--formatter" do
       it "is deprecated" do
         RSpec.should_receive(:deprecate)
@@ -27,6 +38,37 @@ module RSpec::Core
       end
     end
 
+    describe "--default_path" do
+      it "gets converted to --default-path" do
+        options = Parser.parse!(%w[--default_path foo])
+        options[:default_path].should == "foo"
+      end
+    end
+
+    describe "--line_number" do
+      it "gets converted to --line-number" do
+        options = Parser.parse!(%w[--line_number 3])
+        options[:line_numbers].should == ["3"]
+      end
+    end
+
+
+    describe "--default-path" do
+      it "sets the default path where RSpec looks for examples" do
+        options = Parser.parse!(%w[--default-path foo])
+        options[:default_path].should == "foo"
+      end
+    end
+
+    %w[--line-number -l].each do |option|
+      describe option do
+        it "sets the line number of an example to run" do
+          options = Parser.parse!([option, "3"])
+          options[:line_numbers].should == ["3"]
+        end
+      end
+    end
+
     %w[--format -f].each do |option|
       describe option do
         it "defines the formatter" do

data/spec/rspec/core/project_initializer_spec.rb

@@ -1,7 +1,8 @@
 require "spec_helper"
 
 module RSpec::Core
-  describe ProjectInitializer, :fakefs do
+  describe ProjectInitializer, :isolated_directory => true do
+
     describe "#run" do
       context "with no args" do
         let(:command_line_config) { ProjectInitializer.new }
@@ -121,7 +122,6 @@ module RSpec::Core
           config = ProjectInitializer.new("another_arg")
           config.stub(:puts)
           config.stub(:gets => 'no')
-          config.should_receive(:warn).with(/no longer.*another_arg was ignored/)
           config.run
         end
       end

data/spec/rspec/core/rake_task_spec.rb

@@ -19,6 +19,25 @@ module RSpec::Core
       task.__send__(:spec_command)
     end
 
+    context "with a name passed to the constructor" do
+      let(:task) { RakeTask.new(:task_name) }
+
+      it "correctly sets the name" do
+        task.name.should == :task_name
+      end
+    end
+
+    context "with args passed to the rake task" do
+      it "correctly passes along task arguments" do
+        task = RakeTask.new(:rake_task_args, :files) do |t, args|
+          args[:files].should == "first_spec.rb"
+        end
+
+        task.should_receive(:run_task) { true }
+        Rake.application.invoke_task("rake_task_args[first_spec.rb]").should be_true
+      end
+    end
+
     context "default" do
       it "renders rspec" do
         spec_command.should =~ /^#{ruby} -S rspec/
@@ -27,10 +46,10 @@ module RSpec::Core
 
     context "with rcov" do
       it "renders rcov" do
-          with_rcov do
-            spec_command.should =~ /^#{ruby} -S rcov/
-          end
+        with_rcov do
+          spec_command.should =~ /^#{ruby} -S rcov/
         end
+      end
     end
 
     context "with ruby options" do
@@ -80,31 +99,55 @@ module RSpec::Core
       end
     end
 
-    context "with SPEC=path/to/file" do
-      before do
-        @orig_spec = ENV["SPEC"]
-        ENV["SPEC"] = "path/to/file"
+    def specify_consistent_ordering_of_files_to_run(pattern, task)
+      orderings = [
+        %w[ a/1.rb a/2.rb a/3.rb ],
+        %w[ a/2.rb a/1.rb a/3.rb ],
+        %w[ a/3.rb a/2.rb a/1.rb ]
+      ].map do |files|
+        FileList.should_receive(:[]).with(pattern) { files }
+        task.__send__(:files_to_run)
       end
 
-      after do
-        ENV["SPEC"] = @orig_spec
-      end
+      orderings.uniq.size.should eq(1)
+    end
 
+    context "with SPEC env var set" do
       it "sets files to run" do
-        task.__send__(:files_to_run).should eq(["path/to/file"])
+        with_env_vars 'SPEC' => 'path/to/file' do
+          task.__send__(:files_to_run).should eq(["path/to/file"])
+        end
       end
-    end
 
-    context "with paths with quotes" do
-      it "escapes the quotes" do
-        task = RakeTask.new do |t|
-          t.pattern = File.join(Dir.tmpdir, "*spec.rb")
+      it "sets the files to run in a consistent order, regardless of the underlying FileList ordering" do
+        with_env_vars 'SPEC' => 'a/*.rb' do
+          specify_consistent_ordering_of_files_to_run('a/*.rb', task)
         end
-        ["first_spec.rb", "second_\"spec.rb", "third_\'spec.rb"].each do |file_name|
+      end
+    end
+
+    it "sets the files to run in a consistent order, regardless of the underlying FileList ordering" do
+      task = RakeTask.new(:consistent_file_order) do |t|
+        t.pattern = 'a/*.rb'
+      end
+
+      # since the config block is deferred til task invocation, must fake
+      # calling the task so the expected pattern is picked up
+      task.should_receive(:run_task) { true }
+      Rake.application.invoke_task(task.name).should be_true
+
+      specify_consistent_ordering_of_files_to_run('a/*.rb', task)
+    end
+
+    context "with paths with quotes or spaces" do
+      it "escapes the quotes and spaces" do
+        task.pattern = File.join(Dir.tmpdir, "*spec.rb")
+        ["first_spec.rb", "second_\"spec.rb", "third_\'spec.rb", "fourth spec.rb"].each do |file_name|
           FileUtils.touch(File.join(Dir.tmpdir, file_name))
         end
         task.__send__(:files_to_run).sort.should eq([
           File.join(Dir.tmpdir, "first_spec.rb"),
+          File.join(Dir.tmpdir, "fourth\\ spec.rb"),
           File.join(Dir.tmpdir, "second_\\\"spec.rb"),
           File.join(Dir.tmpdir, "third_\\\'spec.rb")
         ])

data/spec/rspec/core/reporter_spec.rb

@@ -99,5 +99,22 @@ module RSpec::Core
         yielded.should eq(reporter)
       end
     end
+
+    describe "timing" do
+      it "uses RSpec::Core::Time as to not be affected by changes to time in examples" do
+        formatter = double(:formatter).as_null_object
+        reporter = Reporter.new formatter
+        reporter.start 1
+        Time.stub(:now => Time.utc(2012, 10, 1))
+
+        duration = nil
+        formatter.stub(:dump_summary) do |dur, _, _, _|
+          duration = dur
+        end
+
+        reporter.finish 1234
+        duration.should be < 0.2
+      end
+    end
   end
 end

data/spec/rspec/core/runner_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'rspec/core/drb_command_line'
 
 module RSpec::Core
   describe Runner do

data/spec/rspec/core/shared_example_group_spec.rb

@@ -6,18 +6,28 @@ module RSpec::Core
     ExampleModule = Module.new
     ExampleClass = Class.new
 
+    it 'does not add a bunch of private methods to Module' do
+      seg_methods = RSpec::Core::SharedExampleGroup.private_instance_methods
+      expect(Module.private_methods & seg_methods).to eq([])
+    end
+
     %w[share_examples_for shared_examples_for shared_examples shared_context].each do |shared_method_name|
       describe shared_method_name do
         it "is exposed to the global namespace" do
           Kernel.should respond_to(shared_method_name)
         end
 
-        it "raises an ArgumentError when adding a second shared example group with the same name" do
+        it "displays a warning when adding a second shared example group with the same name" do
           group = ExampleGroup.describe('example group')
-          group.send(shared_method_name, 'shared group') {}
-          lambda do
-            group.send(shared_method_name, 'shared group') {}
-          end.should raise_error(ArgumentError, "Shared example group 'shared group' already exists")
+          group.send(shared_method_name, 'some shared group') {}
+          original_declaration = [__FILE__, __LINE__ - 1].join(':')
+
+          warning = nil
+          Kernel.stub(:warn) { |msg| warning = msg }
+
+          group.send(shared_method_name, 'some shared group') {}
+          second_declaration = [__FILE__, __LINE__ - 1].join(':')
+          warning.should include('some shared group', original_declaration, second_declaration)
         end
 
         ["name", :name, ExampleModule, ExampleClass].each do |object|
@@ -62,6 +72,8 @@ module RSpec::Core
     end
 
     describe "#share_as" do
+      before { RSpec.stub(:warn) }
+
       it "is exposed to the global namespace" do
         Kernel.should respond_to("share_as")
       end

data/spec/rspec/core/subject_spec.rb

@@ -91,6 +91,17 @@ module RSpec::Core
           end
           group.run.should be_true
         end
+
+        it "is referred from inside subject by the name" do
+          group = ExampleGroup.describe do
+            subject(:list) { [1,2,3] }
+            describe 'first' do
+              subject(:first_element) { list.first }
+              it { should eq(1) }
+            end
+          end
+          group.run.should be_true
+        end
       end
     end
 

data/spec/spec_helper.rb

@@ -18,7 +18,13 @@ Spork.prefork do
   require 'rspec/autorun'
   require 'autotest/rspec2'
   require 'aruba/api'
-  require 'fakefs/spec_helpers'
+
+  if RUBY_PLATFORM == 'java'
+    # Works around https://jira.codehaus.org/browse/JRUBY-5678
+    require 'fileutils'
+    ENV['TMPDIR'] = File.expand_path('../../tmp', __FILE__)
+    FileUtils.mkdir_p(ENV['TMPDIR'])
+  end
 
   Dir['./spec/support/**/*.rb'].map {|f| require f}
 
@@ -66,6 +72,30 @@ Spork.prefork do
     ENV.has_key?('TM_MODE') || ENV.has_key?('EMACS') || ENV.has_key?('VIM')
   end
 
+  module EnvHelpers
+    def with_env_vars(vars)
+      original = ENV.to_hash
+      vars.each { |k, v| ENV[k] = v }
+
+      begin
+        yield
+      ensure
+        ENV.replace(original)
+      end
+    end
+
+    def without_env_vars(*vars)
+      original = ENV.to_hash
+      vars.each { |k| ENV.delete(k) }
+
+      begin
+        yield
+      ensure
+        ENV.replace(original)
+      end
+    end
+  end
+
   RSpec.configure do |c|
     # structural
     c.alias_it_behaves_like_to 'it_has_behavior'
@@ -79,7 +109,7 @@ Spork.prefork do
     c.treat_symbols_as_metadata_keys_with_true_values = true
     c.color = !in_editor?
     c.filter_run :focus
-    c.include FakeFS::SpecHelpers, :fakefs
+    c.include EnvHelpers
     c.run_all_when_everything_filtered = true
     c.filter_run_excluding :ruby => lambda {|version|
       case version.to_s