rspec-core 2.0.0.beta.12 → 2.0.0.beta.13

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

@@ -3,6 +3,29 @@ require "spec_helper"
 module RSpec::Core::Formatters
 
   describe BaseTextFormatter do
+    describe "#summary_line" do
+      let(:output) { StringIO.new }
+      let(:formatter) { RSpec::Core::Formatters::BaseTextFormatter.new(output) }
+
+      context "with 0s" do
+        it "outputs pluralized (excluding pending)" do
+          formatter.summary_line(0,0,0).should eq("0 examples, 0 failures")
+        end
+      end
+
+      context "with 1s" do
+        it "outputs singular (including pending)" do
+          formatter.summary_line(1,1,1).should eq("1 example, 1 failure, 1 pending")
+        end
+      end
+
+      context "with 2s" do
+        it "outputs pluralized (including pending)" do
+          formatter.summary_line(2,2,2).should eq("2 examples, 2 failures, 2 pending")
+        end
+      end
+    end
+
     describe "#dump_failures" do
       it "preserves formatting" do 
         output = StringIO.new

data/spec/rspec/core/metadata_spec.rb

@@ -25,6 +25,38 @@ module RSpec
         end
       end
 
+      describe "describes" do
+        context "with a String" do
+          it "returns nil" do
+            m = Metadata.new
+            m.process('group')
+
+            m = m.for_example("example", {})
+            m[:example_group][:describes].should be_nil
+          end
+        end
+
+        context "with a Symbol" do
+          it "returns nil" do
+            m = Metadata.new
+            m.process(:group)
+
+            m = m.for_example("example", {})
+            m[:example_group][:describes].should be_nil
+          end
+        end
+
+        context "with a class" do
+          it "returns the class" do
+            m = Metadata.new
+            m.process(String)
+
+            m = m.for_example("example", {})
+            m[:example_group][:describes].should be(String)
+          end
+        end
+      end
+
       describe "full description" do
         it "concats the example group name and description" do
           m = Metadata.new

data/spec/rspec/core/runner_spec.rb

@@ -6,6 +6,7 @@ module RSpec::Core
       it 'sets an at_exit hook if none is already set' do
         RSpec::Core::Runner.stub(:installed_at_exit?).and_return(false)
         RSpec::Core::Runner.stub(:running_in_drb?).and_return(false)
+        RSpec::Core::Runner.stub(:at_exit_hook_disabled?).and_return(false)
         RSpec::Core::Runner.should_receive(:at_exit)
         RSpec::Core::Runner.autorun
       end
@@ -13,6 +14,7 @@ module RSpec::Core
       it 'does not set the at_exit hook if it is already set' do
         RSpec::Core::Runner.stub(:installed_at_exit?).and_return(true)
         RSpec::Core::Runner.stub(:running_in_drb?).and_return(false)
+        RSpec::Core::Runner.stub(:at_exit_hook_disabled?).and_return(false)
         RSpec::Core::Runner.should_receive(:at_exit).never
         RSpec::Core::Runner.autorun
       end
@@ -24,7 +26,6 @@ module RSpec::Core
           @err = @out = StringIO.new
 
           @options = RSpec::Core::ConfigurationOptions.new(%w[--drb --drb-port 8181 --color])
-          @options.parse_options
           RSpec::Core::ConfigurationOptions.stub(:new) { @options }
           
           @drb_proxy = double(RSpec::Core::DRbCommandLine, :run => true)

data/spec/rspec/core/shared_example_group_spec.rb

@@ -172,7 +172,7 @@ module RSpec::Core
             it "has one example" do; end
             it "has another example" do; end
             it "includes modules, included into shared example_group, into current example_group", :compat => 'rspec-1.2' do
-              raise "FAIL" unless running_example.example_group.included_modules.include?(RunningSharedExamplesJustForTesting)
+              raise "FAIL" unless example.example_group.included_modules.include?(RunningSharedExamplesJustForTesting)
             end
           end
         end

data/spec/spec_helper.rb

@@ -1,72 +1,70 @@
 require 'rubygems'
-require 'spork'
 
-Spork.prefork do
-  $LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
-  require 'rspec/core'
+$LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
+require 'rspec/core'
 
-  $LOAD_PATH << File.expand_path('../../../rspec-expectations/lib', __FILE__)
-  $LOAD_PATH << File.expand_path('../../../rspec-mocks/lib', __FILE__)
-  require 'rspec/expectations'
-  require 'rspec/mocks'
+$LOAD_PATH << File.expand_path('../../../rspec-expectations/lib', __FILE__)
+$LOAD_PATH << File.expand_path('../../../rspec-mocks/lib', __FILE__)
+require 'rspec/expectations'
+require 'rspec/mocks'
 
-  begin
-    require 'autotest'
-  rescue LoadError
-    raise "Could not load autotest."
-  end
+begin
+  require 'autotest'
+rescue LoadError
+  raise "Could not load autotest."
+end
 
-  require 'autotest/rspec2'
+require 'autotest/rspec2'
 
-  Dir['./spec/support/**/*.rb'].map {|f| require f}
+Dir['./spec/support/**/*.rb'].map {|f| require f}
 
-  module RSpec
-    module Core
-      module Matchers
-        def fail
-          raise_error(::RSpec::Expectations::ExpectationNotMetError)
-        end
+module RSpec
+  module Core
+    module Matchers
+      def fail
+        raise_error(::RSpec::Expectations::ExpectationNotMetError)
+      end
 
-        def fail_with(message)
-          raise_error(::RSpec::Expectations::ExpectationNotMetError, message)
-        end
+      def fail_with(message)
+        raise_error(::RSpec::Expectations::ExpectationNotMetError, message)
       end
     end
   end
+end
 
-  class NullObject
-    def method_missing(method, *args, &block)
-      # ignore
-    end
+class NullObject
+  def method_missing(method, *args, &block)
+    # ignore
   end
+end
 
-  class RSpec::Core::ExampleGroup
-    def self.run_all(reporter=nil)
-      run(reporter || NullObject.new)
-    end
+class RSpec::Core::ExampleGroup
+  def self.run_all(reporter=nil)
+    run(reporter || NullObject.new)
   end
+end
 
-  def in_editor?
-    ENV.has_key?('TM_MODE') || ENV.has_key?('EMACS') || ENV.has_key?('VIM')
-  end
+def in_editor?
+  ENV.has_key?('TM_MODE') || ENV.has_key?('EMACS') || ENV.has_key?('VIM')
+end
 
-  RSpec.configure do |c|
-    c.color_enabled = !in_editor?
-    c.filter_run :focus => true
-    c.run_all_when_everything_filtered = true
-    c.filter_run_excluding :ruby => lambda {|version|
+RSpec.configure do |c|
+  c.color_enabled = !in_editor?
+  c.filter_run :focus => true
+  c.run_all_when_everything_filtered = true
+  c.filter_run_excluding :ruby => lambda {|version|
+    case version.to_s
+    when "!ruby"
+      RUBY_ENGINE != "jruby"
+    else
       !(RUBY_VERSION.to_s =~ /^#{version.to_s}/)
-    }
-    c.before(:each) do
-      @real_world = RSpec.world
-      RSpec.instance_variable_set(:@world, RSpec::Core::World.new)
-    end
-    c.after(:each) do
-      RSpec.instance_variable_set(:@world, @real_world)
     end
+  }
+  c.before(:each) do
+    @real_world = RSpec.world
+    RSpec.instance_variable_set(:@world, RSpec::Core::World.new)
+  end
+  c.after(:each) do
+    RSpec.instance_variable_set(:@world, @real_world)
   end
 end
-
-Spork.each_run do
-end
-

data/specs.watchr

@@ -20,7 +20,7 @@ end
 
 def run(files_to_run)
   puts("Running: #{files_to_run}")
-  system("clear;ruby -Ilib bin/rspec -cfs #{files_to_run}")
+  system("clear;ruby -Ilib bin/rspec -c #{files_to_run}")
   no_int_for_you
 end
 

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - beta
-  - 12
-  version: 2.0.0.beta.12
+  - 13
+  version: 2.0.0.beta.13
 platform: ruby
 authors: 
 - Chad Humphries
@@ -17,13 +17,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-14 00:00:00 -05:00
+date: 2010-06-23 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  type: :development
   name: rspec-expectations
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -32,14 +32,14 @@ dependencies:
         - 0
         - 0
         - beta
-        - 12
-        version: 2.0.0.beta.12
-  type: :development
-  version_requirements: *id001
+        - 13
+        version: 2.0.0.beta.13
+  requirement: *id001
+  prerelease: false
 - !ruby/object:Gem::Dependency 
+  type: :development
   name: rspec-mocks
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -48,14 +48,14 @@ dependencies:
         - 0
         - 0
         - beta
-        - 12
-        version: 2.0.0.beta.12
-  type: :development
-  version_requirements: *id002
+        - 13
+        version: 2.0.0.beta.13
+  requirement: *id002
+  prerelease: false
 - !ruby/object:Gem::Dependency 
+  type: :development
   name: cucumber
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -64,12 +64,12 @@ dependencies:
         - 5
         - 3
         version: 0.5.3
-  type: :development
-  version_requirements: *id003
+  requirement: *id003
+  prerelease: false
 - !ruby/object:Gem::Dependency 
+  type: :development
   name: autotest
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -78,9 +78,9 @@ dependencies:
         - 2
         - 9
         version: 4.2.9
-  type: :development
-  version_requirements: *id004
-description: RSpec runner and example group classes
+  requirement: *id004
+  prerelease: false
+description: RSpec runner and example groups
 email: dchelimsky@gmail.com;chad.humphries@gmail.com
 executables: 
 - rspec
@@ -94,6 +94,7 @@ files:
 - .gitignore
 - .rspec
 - .treasure_map.rb
+- Gemfile
 - License.txt
 - README.markdown
 - Rakefile
@@ -104,6 +105,7 @@ files:
 - bin/spec
 - cucumber.yml
 - features/command_line/example_name_option.feature
+- features/command_line/exit_status.feature
 - features/command_line/line_number_appended_to_path.feature
 - features/command_line/line_number_option.feature
 - features/configuration/custom_settings.feature
@@ -168,6 +170,7 @@ files:
 - script/console
 - spec/autotest/failed_results_re_spec.rb
 - spec/autotest/rspec_spec.rb
+- spec/rspec/core/command_line_spec.rb
 - spec/rspec/core/configuration_options_spec.rb
 - spec/rspec/core/configuration_spec.rb
 - spec/rspec/core/deprecations_spec.rb
@@ -201,13 +204,13 @@ files:
 - spec/support/matchers.rb
 - specs.watchr
 has_rdoc: true
-homepage: http://github.com/rspec/core
+homepage: http://github.com/rspec/rspec-core
 licenses: []
 
 post_install_message: |
   **************************************************
   
-    Thank you for installing rspec-core-2.0.0.beta.12
+    Thank you for installing rspec-core-2.0.0.beta.13
     
   **************************************************
 
@@ -237,10 +240,11 @@ rubyforge_project: rspec
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: rspec-core-2.0.0.beta.12
+summary: rspec-core-2.0.0.beta.13
 test_files: 
 - spec/autotest/failed_results_re_spec.rb
 - spec/autotest/rspec_spec.rb
+- spec/rspec/core/command_line_spec.rb
 - spec/rspec/core/configuration_options_spec.rb
 - spec/rspec/core/configuration_spec.rb
 - spec/rspec/core/deprecations_spec.rb