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

data/rspec-core.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-core}
-  s.version = "2.0.0.beta.12"
+  s.version = "2.0.0.beta.13"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chad Humphries", "David Chelimsky"]
-  s.date = %q{2010-06-14}
-  s.description = %q{RSpec runner and example group classes}
+  s.date = %q{2010-06-23}
+  s.description = %q{RSpec runner and example groups}
   s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
   s.executables = ["rspec", "spec"]
   s.extra_rdoc_files = [
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
      ".gitignore",
      ".rspec",
      ".treasure_map.rb",
+     "Gemfile",
      "License.txt",
      "README.markdown",
      "Rakefile",
@@ -31,6 +32,7 @@ Gem::Specification.new do |s|
      "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",
@@ -95,6 +97,7 @@ Gem::Specification.new do |s|
      "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",
@@ -128,10 +131,10 @@ Gem::Specification.new do |s|
      "spec/support/matchers.rb",
      "specs.watchr"
   ]
-  s.homepage = %q{http://github.com/rspec/core}
+  s.homepage = %q{http://github.com/rspec/rspec-core}
   s.post_install_message = %q{**************************************************
 
-  Thank you for installing rspec-core-2.0.0.beta.12
+  Thank you for installing rspec-core-2.0.0.beta.13
   
 **************************************************
 }
@@ -139,10 +142,11 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rspec}
   s.rubygems_version = %q{1.3.6}
-  s.summary = %q{rspec-core-2.0.0.beta.12}
+  s.summary = %q{rspec-core-2.0.0.beta.13}
   s.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",
@@ -181,19 +185,19 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.12"])
-      s.add_development_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.12"])
+      s.add_development_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.13"])
+      s.add_development_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.13"])
       s.add_development_dependency(%q<cucumber>, [">= 0.5.3"])
       s.add_development_dependency(%q<autotest>, [">= 4.2.9"])
     else
-      s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.12"])
-      s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.12"])
+      s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.13"])
+      s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.13"])
       s.add_dependency(%q<cucumber>, [">= 0.5.3"])
       s.add_dependency(%q<autotest>, [">= 4.2.9"])
     end
   else
-    s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.12"])
-    s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.12"])
+    s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.13"])
+    s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.13"])
     s.add_dependency(%q<cucumber>, [">= 0.5.3"])
     s.add_dependency(%q<autotest>, [">= 4.2.9"])
   end

data/spec/rspec/core/command_line_spec.rb

@@ -0,0 +1,72 @@
+require "spec_helper"
+require "stringio"
+
+module RSpec::Core
+  describe CommandLine do
+    context "given an array" do
+      it "converts the contents to a ConfigurationOptions object" do
+        command_line = CommandLine.new(%w[--color])
+        command_line.instance_eval { @options }.should be_a(ConfigurationOptions)
+      end
+    end
+
+    context "given a ConfigurationOptions object" do
+      it "assigns it to @options" do
+        config_options = ConfigurationOptions.new(%w[--color])
+        config_options.parse_options
+        command_line = CommandLine.new(config_options)
+        command_line.instance_eval { @options }.should be(config_options)
+      end
+    end
+
+    describe "#run" do
+      let(:config_options) do
+        config_options = ConfigurationOptions.new(%w[--color])
+        config_options.parse_options
+        config_options
+      end
+
+      let(:command_line) do
+        CommandLine.new(config_options)
+      end
+
+      let(:config) do
+        RSpec::Core::Configuration.new
+      end
+
+      let(:out) { ::StringIO.new }
+
+      before do
+        command_line.stub(:configuration) { config }
+        config.stub(:run_hook)
+      end
+
+      it "runs before suite hooks" do
+        config.should_receive(:run_hook).with(:before, :suite)
+        command_line.run(out, out)
+      end
+
+      it "runs after suite hooks" do
+        config.should_receive(:run_hook).with(:after, :suite)
+        command_line.run(out, out)
+      end
+
+      it "runs after suite hooks even after an error" do
+        after_suite_called = false
+        config.stub(:run_hook) do |*args|
+          case args.first
+          when :before
+            raise "this error"
+          when :after
+            after_suite_called = true
+          end
+        end
+        expect do
+          command_line.run(out, out)
+        end.to raise_error
+        after_suite_called.should be_true
+      end
+    end
+
+  end
+end

data/spec/rspec/core/configuration_options_spec.rb

@@ -22,6 +22,14 @@ describe RSpec::Core::ConfigurationOptions do
       config.should_receive(:requires=).ordered
       opts.configure(config)
     end
+    
+    it "sends requires before formatter" do
+      opts = config_options_object(*%w[--require a/path -f a/formatter])
+      config = double("config").as_null_object
+      config.should_receive(:requires=).ordered
+      config.should_receive(:formatter=).ordered
+      opts.configure(config)
+    end
   end
 
   describe 'color_enabled' do
@@ -175,13 +183,14 @@ describe RSpec::Core::ConfigurationOptions do
   # TODO check if we need to spec that the short options are "expanded" ("-v" becomes "--version" currently)
   describe "#drb_argv" do
     it "preserves extra arguments" do
-      config_options_object(*%w[ a --drb b --color c ]).drb_argv.should eq(%w[ --color a b c ])
+      File.stub(:exist?) { false }
+      config_options_object(*%w[ a --drb b --color c ]).drb_argv.should =~ %w[ --color a b c ]
     end
     
     context "--drb specified in ARGV" do
       it "renders all the original arguments except --drb" do
-        config_options_object(*%w[ --drb --color --format s --line_number 1 --example pattern --profile --backtrace]).
-          drb_argv.should eq(%w[ --color --profile --backtrace --format s --line_number 1 --example pattern ])
+        config_options_object(*%w[ --drb --color --format s --line_number 1 --example pattern --profile --backtrace -I path/a -I path/b --require path/c --require path/d]).
+          drb_argv.should eq(%w[ --color --profile --backtrace --format s --line_number 1 --example pattern -I path/a -I path/b --require path/c --require path/d])
       end
     end
 

data/spec/rspec/core/configuration_spec.rb

@@ -246,6 +246,12 @@ module RSpec::Core
         config.formatter.should be_an_instance_of(formatter_class)
       end
       
+      it "sets a formatter based on its class name" do
+        Object.const_set("CustomFormatter",Class.new(Formatters::BaseFormatter))
+        config.formatter = "CustomFormatter"
+        config.formatter.should be_an_instance_of(CustomFormatter)
+      end
+      
       it "raises ArgumentError if formatter is unknown" do
         lambda { config.formatter = :progresss }.should raise_error(ArgumentError)
       end
@@ -395,6 +401,5 @@ module RSpec::Core
         end
       end
     end
-
   end
 end

data/spec/rspec/core/deprecations_spec.rb

@@ -6,5 +6,24 @@ describe "deprecations" do
       RSpec.should_receive(:warn_deprecation).with /Spec .* RSpec/i
       Spec
     end
+
+    it "returns RSpec" do
+      RSpec.stub(:warn_deprecation)
+      Spec.should == RSpec
+    end
+  end
+
+  describe RSpec::Core::ExampleGroup do
+    describe 'running_example' do
+      it 'is deprecated' do
+        RSpec.should_receive(:warn_deprecation).with /running_example.*example/m
+        self.running_example
+      end
+
+      it "delegates to example" do
+        RSpec.stub(:warn_deprecation)
+        running_example.should == example
+      end
+    end
   end
 end

data/spec/rspec/core/drb_command_line_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe "::DRbCommandLine" do
+describe "::DRbCommandLine", :ruby => "!jruby" do
   before do
     RSpec.stub(:configuration).and_return(RSpec::Core::Configuration.new)
   end

data/spec/rspec/core/example_group_spec.rb

@@ -17,15 +17,15 @@ module RSpec::Core
     describe "top level group" do
       it "runs its children" do
         examples_run = []
-        parent = ExampleGroup.describe("parent")
-        child = parent.describe("child") do
-          it "does something" do
-            examples_run << running_example
+        group = ExampleGroup.describe("parent") do
+          describe("child") do
+            it "does something" do
+              examples_run << example
+            end
           end
         end
 
-        child.filtered_examples.replace(child.examples)
-        parent.run_all
+        group.run_all
         examples_run.should have(1).example
       end
 
@@ -127,6 +127,23 @@ module RSpec::Core
         end
       end
 
+      context "with a constant in an outer group" do
+        context "and a string in an inner group" do
+          it "is the top level constant" do
+            group = ExampleGroup.describe(String) do
+              describe :symbol do
+                example "describes is String" do
+                  debugger
+                  described_class.should eq(String)
+                end
+              end
+            end
+
+            group.run_all.should be_true
+          end
+        end
+      end
+
     end
 
     describe '#description' do
@@ -268,6 +285,42 @@ module RSpec::Core
           example.metadata[:execution_result][:exception_encountered].message.should == "error in before all"
         end
       end
+
+      it "has no 'running example' within before(:all)" do
+        group = ExampleGroup.describe
+        running_example = :none
+        group.before(:all) { running_example = example }
+        group.example("no-op") { }
+        group.run_all
+        running_example.should == nil
+      end
+
+      it "has access to example options within before(:each)" do
+        group = ExampleGroup.describe
+        option = nil
+        group.before(:each) { option = example.options[:data] }
+        group.example("no-op", :data => :sample) { }
+        group.run_all
+        option.should == :sample
+      end
+
+      it "has access to example options within after(:each)" do
+        group = ExampleGroup.describe
+        option = nil
+        group.after(:each) { option = example.options[:data] }
+        group.example("no-op", :data => :sample) { }
+        group.run_all
+        option.should == :sample
+      end
+
+      it "has no 'running example' within after(:all)" do
+        group = ExampleGroup.describe
+        running_example = :none
+        group.after(:all) { running_example = example }
+        group.example("no-op") { }
+        group.run_all
+        running_example.should == nil
+      end
     end
 
     describe "adding examples" do
@@ -308,19 +361,19 @@ module RSpec::Core
 
       describe "A sample nested group", :nested_describe => "yep" do
         it "sets the described class to the constant Object" do
-          running_example.example_group.describes.should == Object
+          example.example_group.describes.should == Object
         end
 
         it "sets the description to 'A sample nested describe'" do
-          running_example.example_group.description.should == 'A sample nested group'
+          example.example_group.description.should == 'A sample nested group'
         end
 
         it "has top level metadata from the example_group and its ancestors" do
-          running_example.example_group.metadata.should include(:little_less_nested => 'yep', :nested_describe => 'yep')
+          example.example_group.metadata.should include(:little_less_nested => 'yep', :nested_describe => 'yep')
         end
 
         it "exposes the parent metadata to the contained examples" do
-          running_example.metadata.should include(:little_less_nested => 'yep', :nested_describe => 'yep')
+          example.metadata.should include(:little_less_nested => 'yep', :nested_describe => 'yep')
         end
       end
 
@@ -379,11 +432,11 @@ module RSpec::Core
       end
 
       it "should be able to access the before all ivars in the before_all_ivars hash", :ruby => 1.8 do
-        running_example.example_group.before_all_ivars.should include('@before_all_top_level' => 'before_all_top_level')
+        example.example_group.before_all_ivars.should include('@before_all_top_level' => 'before_all_top_level')
       end
 
       it "should be able to access the before all ivars in the before_all_ivars hash", :ruby => 1.9 do
-        running_example.example_group.before_all_ivars.should include(:@before_all_top_level => 'before_all_top_level')
+        example.example_group.before_all_ivars.should include(:@before_all_top_level => 'before_all_top_level')
       end
 
       describe "but now I am nested" do
@@ -455,5 +508,60 @@ module RSpec::Core
       end
     end
 
+    describe "#run" do
+      let(:reporter) { double("reporter").as_null_object }
+
+      context "with all examples passing" do
+        it "returns true" do
+          group = describe("something") do
+            it "does something" do
+              # pass
+            end
+            describe ("nested") do
+              it "does something else" do
+                # pass
+              end
+            end
+          end
+
+          group.run(reporter).should be_true
+        end
+      end
+
+      context "with top level example failing" do
+        it "returns false" do
+          group = describe("something") do
+            it "does something (wrong - fail)" do
+              raise "fail"
+            end
+            describe ("nested") do
+              it "does something else" do
+                # pass
+              end
+            end
+          end
+
+          group.run(reporter).should be_false
+        end
+      end
+
+      context "with nested example failing" do
+        it "returns true" do
+          group = describe("something") do
+            it "does something" do
+              # pass
+            end
+            describe ("nested") do
+              it "does something else (wrong -fail)" do
+                raise "fail"
+              end
+            end
+          end
+
+          group.run(reporter).should be_false
+        end
+      end
+    end
+
   end
 end

data/spec/rspec/core/example_spec.rb

@@ -5,37 +5,41 @@ describe RSpec::Core::Example, :parent_metadata => 'sample' do
     RSpec::Core::ExampleGroup.describe('group description')
   end
 
-  let(:example) do
+  let(:example_instance) do
     example_group.example('example description')
   end
 
   describe "attr readers" do
     it "should have one for the parent example group" do
-      example.should respond_to(:example_group)
+      example_instance.should respond_to(:example_group)
     end
 
-    it "should have one for it's description" do
-      example.should respond_to(:description)
+    it "should have one for its description" do
+      example_instance.should respond_to(:description)
     end
 
-    it "should have one for it's metadata" do
-      example.should respond_to(:metadata)
+    it "should have one for its metadata" do
+      example_instance.should respond_to(:metadata)
     end
 
-    it "should have one for it's block" do
-      example.should respond_to(:example_block)
+    it "should have one for its block" do
+      example_instance.should respond_to(:example_block)
+    end
+
+    it "should have one for its options" do
+      example_instance.should respond_to(:options)
     end
   end
 
   describe '#inspect' do
     it "should return 'group description - description'" do
-      example.inspect.should == 'group description example description'
+      example_instance.inspect.should == 'group description example description'
     end
   end
 
   describe '#to_s' do
     it "should return #inspect" do
-      example.to_s.should == example.inspect
+      example_instance.to_s.should == example_instance.inspect
     end
   end
 
@@ -47,12 +51,18 @@ describe RSpec::Core::Example, :parent_metadata => 'sample' do
 
   describe "accessing metadata within a running example" do
     it "should have a reference to itself when running" do
-      running_example.description.should == "should have a reference to itself when running"
+      example.description.should == "should have a reference to itself when running"
     end
 
     it "should be able to access the example group's top level metadata as if it were its own" do
-      running_example.example_group.metadata.should include(:parent_metadata => 'sample')
-      running_example.metadata.should include(:parent_metadata => 'sample')
+      example.example_group.metadata.should include(:parent_metadata => 'sample')
+      example.metadata.should include(:parent_metadata => 'sample')
+    end
+  end
+
+  describe "accessing options within a running example" do
+    it "should be able to look up option values by key", :demo => :data do
+      example.options[:demo].should == :data
     end
   end
 
@@ -81,7 +91,7 @@ describe RSpec::Core::Example, :parent_metadata => 'sample' do
       after_run = false
       group = RSpec::Core::ExampleGroup.describe do
         after(:each) { after_run = true }
-        example('example') { raise "this error" } 
+        example('example') { raise "this error" }
       end
       group.run_all
       after_run.should be_true, "expected after(:each) to be run"
@@ -90,13 +100,13 @@ describe RSpec::Core::Example, :parent_metadata => 'sample' do
 
   describe "#in_block?" do
     before do
-      running_example.should_not be_in_block
+      example.should_not be_in_block
     end
     it "is only true during the example (but not before or after)" do
-      running_example.should be_in_block
+      example.should be_in_block
     end
     after do
-      running_example.should_not be_in_block
+      example.should_not be_in_block
     end
   end
 end