rspec-core 2.8.0 → 2.9.0.rc2

data/lib/rspec/core/version.rb

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

data/lib/rspec/core/world.rb

@@ -4,12 +4,13 @@ module RSpec
 
       include RSpec::Core::Hooks
 
-      attr_reader :example_groups, :filtered_examples, :wants_to_quit
-      attr_writer :wants_to_quit
+      attr_reader :example_groups, :shared_example_groups, :filtered_examples
+      attr_accessor :wants_to_quit
 
       def initialize(configuration=RSpec.configuration)
         @configuration = configuration
         @example_groups = [].extend(Extensions::Ordered)
+        @shared_example_groups = {}
         @filtered_examples = Hash.new { |hash,group|
           hash[group] = begin
             examples = group.examples.dup
@@ -22,6 +23,7 @@ module RSpec
 
       def reset
         example_groups.clear
+        shared_example_groups.clear
       end
 
       def filter_manager
@@ -45,12 +47,10 @@ module RSpec
         @configuration.configure_group(group)
       end
 
-      def shared_example_groups
-        @shared_example_groups ||= {}
-      end
-
       def example_count
-        example_groups.collect {|g| g.descendants}.flatten.inject(0) { |sum, g| sum += g.filtered_examples.size }
+        example_groups.collect {|g| g.descendants}.flatten.inject(0) do |sum, g|
+          sum += g.filtered_examples.size
+        end
       end
 
       def preceding_declaration_line(filter_line)

data/spec/autotest/rspec_spec.rb

@@ -30,7 +30,7 @@ describe Autotest::Rspec2 do
 
     it "makes the appropriate test command" do
       actual_command = rspec_autotest.make_test_cmd(@files_to_test)
-      expected_command = /#{ruby_cmd}.*#{spec_cmd} (.*)/
+      expected_command = /#{ruby_cmd}.*'#{spec_cmd}' (.*)/
 
       actual_command.should match(expected_command)
 

data/spec/rspec/core/configuration_options_spec.rb

@@ -74,13 +74,9 @@ describe RSpec::Core::ConfigurationOptions do
       ["--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],
-      ["--tty", nil, :tty, true]
+      ["--drb-port", "37", :drb_port, 37]
     ].each do |cli_option, cli_value, config_key, config_value|
       it "forces #{config_key}" do
         opts = config_options_object(*[cli_option, cli_value].compact)
@@ -305,6 +301,13 @@ describe RSpec::Core::ConfigurationOptions do
     end
   end
 
+  describe "#filter_manager" do
+    it "returns the same object as RSpec::configuration.filter_manager" do
+      config_options_object.filter_manager.
+        should be(RSpec::configuration.filter_manager)
+    end
+  end
+
   describe "sources: ~/.rspec, ./.rspec, custom, CLI, and SPEC_OPTS" do
     before(:each) do
       FileUtils.mkpath(File.expand_path("~"))

data/spec/rspec/core/configuration_spec.rb

@@ -713,20 +713,16 @@ module RSpec::Core
       end
 
       describe "the default :if filter" do
-        it "does not exclude a spec with no :if metadata" do
-          config.exclusion_filter[:if].call(nil, {}).should be_false
+        it "does not exclude a spec with  { :if => true } metadata" do
+          config.exclusion_filter[:if].call(true).should be_false
         end
 
-        it "does not exclude a spec with { :if => true } metadata" do
-          config.exclusion_filter[:if].call(true, {:if => true}).should be_false
+        it "excludes a spec with  { :if => false } metadata" do
+          config.exclusion_filter[:if].call(false).should be_true
         end
 
-        it "excludes a spec with { :if => false } metadata" do
-          config.exclusion_filter[:if].call(false, {:if => false}).should be_true
-        end
-
-        it "excludes a spec with { :if => nil } metadata" do
-          config.exclusion_filter[:if].call(false, {:if => nil}).should be_true
+        it "excludes a spec with  { :if => nil } metadata" do
+          config.exclusion_filter[:if].call(nil).should be_true
         end
       end
 
@@ -1005,6 +1001,38 @@ module RSpec::Core
         group.included_modules.should include(mod1)
         group.included_modules.should include(mod2)
       end
+
+      module IncludeOrExtendMeOnce
+        def self.included(host)
+          raise "included again" if host.instance_methods.include?(:foobar)
+          host.class_eval { def foobar; end }
+        end
+
+        def self.extended(host)
+          raise "extended again" if host.respond_to?(:foobar)
+          def host.foobar; end
+        end
+      end
+
+      it "doesn't include a module when already included in ancestor" do
+        config.include(IncludeOrExtendMeOnce, :foo => :bar)
+
+        group = ExampleGroup.describe("group", :foo => :bar)
+        child = group.describe("child")
+
+        config.configure_group(group)
+        config.configure_group(child)
+      end
+
+      it "doesn't extend when ancestor is already extended with same module" do
+        config.extend(IncludeOrExtendMeOnce, :foo => :bar)
+
+        group = ExampleGroup.describe("group", :foo => :bar)
+        child = group.describe("child")
+
+        config.configure_group(group)
+        config.configure_group(child)
+      end
     end
 
     describe "#alias_example_to" do

data/spec/rspec/core/example_group_spec.rb

@@ -293,6 +293,22 @@ module RSpec::Core
             group.run.should be_true
           end
         end
+
+        context "and metadata redefinition after `described_class` call" do
+          it "is the redefined level constant" do
+            group = ExampleGroup.describe(String) do
+              described_class
+              metadata[:example_group][:described_class] = Object
+              describe :symbol do
+                example "described_class is Object" do
+                  described_class.should eq(Object)
+                end
+              end
+            end
+
+            group.run.should be_true
+          end
+        end
       end
 
       context "in a nested group" do

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

@@ -28,7 +28,6 @@ module RSpec::Core::Formatters
     end
 
     it "represents nested group using hierarchy tree" do
-
       output = StringIO.new
       RSpec.configuration.stub(:color_enabled?) { false }
 
@@ -60,6 +59,29 @@ root
   context 2
     nested example 2.1
     nested example 2.2
+")
+    end
+
+    it "strips whitespace for each row" do
+      output = StringIO.new
+      RSpec.configuration.stub(:color_enabled?) { false }
+
+      formatter = RSpec::Core::Formatters::DocumentationFormatter.new(output)
+
+      group = RSpec::Core::ExampleGroup.describe(" root ")
+      context1 = group.describe(" nested ")
+      context1.example(" example 1 ") {}
+      context1.example(" example 2 ", :pending => true){}
+      context1.example(" example 3 ") { fail }
+
+      group.run(RSpec::Core::Reporter.new(formatter))
+
+      output.string.should eql("
+root
+  nested
+    example 1
+    example 2 (PENDING: No reason given)
+    example 3 (FAILED - 1)
 ")
     end
   end

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

@@ -4,6 +4,26 @@ require 'rspec/core/formatters/helpers'
 describe RSpec::Core::Formatters::Helpers do
   let(:helper) { Object.new.extend(RSpec::Core::Formatters::Helpers) }
 
+  describe "format duration" do
+    context '> 60 and < 120' do
+      it "returns 'x minute xx seconds' formatted string" do
+        helper.format_duration(70.14).should eq("1 minute 10.14 seconds")
+      end
+    end
+
+    context '> 120' do
+      it "returns 'x minutes xx seconds' formatted string" do
+        helper.format_duration(135.14).should eq("2 minutes 15.14 seconds")
+      end
+    end
+
+    context '< 60' do
+      it "returns 'xx seconds' formatted string" do
+        helper.format_duration(45.5).should eq("45.5 seconds")
+      end
+    end
+  end
+
   describe "format seconds" do
     context "sub second times" do
       it "returns 5 digits of precision" do

data/spec/rspec/core/metadata_spec.rb

@@ -126,10 +126,9 @@ module RSpec
           example_metadata.filter_applies?(:if, lambda { |v| !v }).should be_false
         end
 
-        it "passes the metadata hash as the second argument if a given proc expects 2 args" do
-          passed_metadata = nil
-          example_metadata.filter_applies?(:if, lambda { |v, m| passed_metadata = m })
-          passed_metadata.should eq(example_metadata)
+        it "matches a proc with an arity of 2" do
+          example_metadata[:foo] = nil
+          example_metadata.filter_applies?(:foo, lambda { |v, m| m == example_metadata }).should be_true
         end
 
         context "with an Array" do

data/spec/rspec/core/shared_example_group_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 module RSpec::Core
   describe SharedExampleGroup do
-    
+
     ExampleModule = Module.new
     ExampleClass = Class.new
 
@@ -19,7 +19,7 @@ module RSpec::Core
             group.send(method_name, 'shared group') {}
           end.should raise_error(ArgumentError, "Shared example group 'shared group' already exists")
         end
-        
+
         ["name", :name, ExampleModule, ExampleClass].each do |object|
           type = object.class.name.downcase
           context "given a #{type}" do

data/spec/rspec/core/world_spec.rb

@@ -9,6 +9,16 @@ module RSpec::Core
     let(:configuration) { RSpec::Core::Configuration.new }
     let(:world) { RSpec::Core::World.new(configuration) }
 
+    describe '#reset' do
+      it 'clears #example_groups and #shared_example_groups' do
+        world.example_groups << :example_group
+        world.shared_example_groups[:shared] = :example_group
+        world.reset
+        world.example_groups.should be_empty
+        world.shared_example_groups.should be_empty
+      end
+    end
+
     describe "#example_groups" do
       it "contains all registered example groups" do
         group = RSpec::Core::ExampleGroup.describe("group"){}
@@ -64,7 +74,7 @@ module RSpec::Core
       context "with two exaples and the second example is registre first" do
         let(:second_group_declaration_line) { second_group.metadata[:example_group][:line_number] }
 
-        before do 
+        before do
           world.register(second_group)
           world.register(group)
         end

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-core
 version: !ruby/object:Gem::Version 
-  hash: 47
-  prerelease: 
+  hash: -2242269716
+  prerelease: 6
   segments: 
   - 2
-  - 8
+  - 9
   - 0
-  version: 2.8.0
+  - rc
+  - 2
+  version: 2.9.0.rc2
 platform: ruby
 authors: 
 - Steven Baker
@@ -17,9 +19,152 @@ autorequire:
 bindir: exe
 cert_chain: []
 
-date: 2012-01-05 00:00:00 Z
-dependencies: []
-
+date: 2012-03-12 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: cucumber
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 1
+        - 1
+        - 9
+        version: 1.1.9
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: aruba
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 4
+        - 11
+        version: 0.4.11
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: ZenTest
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 35
+        segments: 
+        - 4
+        - 6
+        - 2
+        version: 4.6.2
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: nokogiri
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 5
+        - 2
+        version: 1.5.2
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: fakefs
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 0
+        - 4
+        - 0
+        version: 0.4.0
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: syntax
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 61
+        segments: 
+        - 0
+        - 10
+        - 5
+        version: 0.10.5
+  type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: rr
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 1
+        - 0
+        - 4
+        version: 1.0.4
+  type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: flexmock
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 59
+        segments: 
+        - 0
+        - 9
+        - 0
+        version: 0.9.0
+  type: :development
+  version_requirements: *id009
 description: BDD for Ruby. RSpec runner and example groups.
 email: rspec-users@rubyforge.org
 executables: 
@@ -27,9 +172,8 @@ executables:
 - rspec
 extensions: []
 
-extra_rdoc_files: 
-- README.md
-- License.txt
+extra_rdoc_files: []
+
 files: 
 - lib/autotest/discover.rb
 - lib/autotest/rspec2.rb
@@ -81,10 +225,11 @@ files:
 - lib/rspec/core/subject.rb
 - lib/rspec/core/version.rb
 - lib/rspec/core/world.rb
-- lib/rspec/monkey.rb
-- lib/rspec/monkey/spork/test_framework/rspec.rb
-- License.txt
 - README.md
+- License.txt
+- Changelog.md
+- .yardopts
+- .document
 - features/Autotest.md
 - features/README.md
 - features/Upgrade.md
@@ -218,19 +363,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: rspec
-rubygems_version: 1.8.11
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: rspec-core-2.8.0
+summary: rspec-core-2.9.0.rc2
 test_files: 
 - features/Autotest.md
 - features/README.md