rspec-core 2.0.1 → 2.1.0

data/lib/rspec/core/version.rb

@@ -1,7 +1,7 @@
 module RSpec # :nodoc:
   module Core # :nodoc:
     module Version # :nodoc:
-      STRING = '2.0.1'
+      STRING = '2.1.0'
     end
   end
 end

data/lib/rspec/core/world.rb

@@ -18,6 +18,11 @@ module RSpec
         }
       end
 
+      def register(example_group)
+        example_groups << example_group
+        example_group
+      end
+
       def inclusion_filter
         @configuration.filter
       end
@@ -39,13 +44,13 @@ module RSpec
       end
 
       def apply_inclusion_filters(examples, conditions={})
-        examples.select(&all_apply?(conditions))
+        examples.select(&apply?(:any?, conditions))
       end
 
       alias_method :find, :apply_inclusion_filters
 
       def apply_exclusion_filters(examples, conditions={})
-        examples.reject(&all_apply?(conditions))
+        examples.reject(&apply?(:any?, conditions))
       end
 
       def preceding_declaration_line(filter_line)
@@ -82,8 +87,8 @@ module RSpec
 
     private
 
-      def all_apply?(conditions)
-        lambda {|example| example.metadata.all_apply?(conditions)}
+      def apply?(predicate, conditions)
+        lambda {|example| example.metadata.apply?(predicate, conditions)}
       end
 
       def declaration_line_numbers

data/rspec-core.gemspec

@@ -27,19 +27,12 @@ Gem::Specification.new do |s|
 
   Thank you for installing #{s.summary}
 
-  Please be sure to look at Upgrade.markdown to see what might have changed
-  since the last release.
+  Please be sure to look at the upgrade instructions to see what might have
+  changed since the last release:
+
+  http://github.com/rspec/rspec-core/blob/master/Upgrade.markdown
 
 **************************************************
 }
-
-  s.add_development_dependency "rspec-expectations", "~> 2.0.1"
-  s.add_development_dependency "rspec-mocks",        "~> 2.0.1"
-  s.add_development_dependency "cucumber",           "~> 0.9.2"
-  s.add_development_dependency "autotest",           "~> 4.2.9"
-  s.add_development_dependency "syntax",             "~> 1.0.0"
-  s.add_development_dependency "flexmock"
-  s.add_development_dependency "mocha"
-  s.add_development_dependency "rr"
 end
 

data/spec/rspec/core/command_line_spec.rb

@@ -31,19 +31,30 @@ module RSpec::Core
         config_options
       end
 
-      let(:command_line) do
-        CommandLine.new(config_options, config)
-      end
-
       let(:config) do
         RSpec::Core::Configuration.new
       end
 
-      let(:err) { ::StringIO.new }
+      let(:world) do
+        RSpec::Core::World.new
+      end
+
+      let(:command_line) do
+        CommandLine.new(config_options, config, world)
+      end
+
       let(:out) { ::StringIO.new }
+      let(:err) { ::StringIO.new }
 
       before do
         config.stub(:run_hook)
+
+        config.should_receive(:load_spec_files)
+        config.should_receive(:configure_mock_framework)
+        config.should_receive(:configure_expectation_framework)
+
+        world.should_receive(:announce_inclusion_filter)
+        world.should_receive(:announce_exclusion_filter)
       end
 
       it "configures streams before command line options" do

data/spec/rspec/core/configuration_options_spec.rb

@@ -215,6 +215,12 @@ describe RSpec::Core::ConfigurationOptions do
     end
   end
 
+  describe "--fail-fast" do
+    it "sets fail_fast on config" do
+      options_from_args("--fail-fast").should include(:fail_fast => true)
+    end
+  end
+
   describe "options file (override)" do
     let(:config) { OpenStruct.new }
 

data/spec/rspec/core/configuration_spec.rb

@@ -14,7 +14,7 @@ module RSpec::Core
       end
     end
 
-    describe "#mock_framework_class" do
+    describe "mock_framework" do
       before(:each) do
         config.stub(:require)
       end
@@ -46,6 +46,34 @@ module RSpec::Core
 
     end
 
+    describe "expectation_framework" do
+
+      it "defaults to :rspec" do
+        config.should_receive(:require).with('rspec/core/expecting/with_rspec')
+        config.require_expectation_framework_adapter
+      end
+
+      [:rspec].each do |framework|
+        it "uses #{framework.inspect} framework when set explicitly" do
+          config.should_receive(:require).with("rspec/core/expecting/with_#{framework}")
+          config.mock_framework = framework
+          config.require_expectation_framework_adapter
+        end
+      end
+
+      it "supports expect_with for backward compatibility with rspec-1.x" do
+        config.should_receive(:require).with('rspec/core/expecting/with_rspec')
+        config.mock_with :rspec
+        config.require_expectation_framework_adapter
+      end
+
+      it "raises ArgumentError if framework is not supported" do
+        config.expectation_framework = :not_supported
+        expect { config.require_expectation_framework_adapter }.to raise_error(ArgumentError)
+      end
+
+    end
+
     context "setting the files to run" do
 
       it "loads files not following pattern if named explicitly" do
@@ -128,6 +156,11 @@ module RSpec::Core
       end
 
       context "with full_description" do
+        it "overrides :focused" do
+          config.filter_run :focused => true
+          config.full_description = "foo"
+          config.filter.should_not have_key(:focused)
+        end
 
         it "assigns the example name as the filter on description" do
           config.full_description = "foo"
@@ -368,9 +401,17 @@ module RSpec::Core
     describe "#filter_run" do
       it "sets the filter" do
         config.filter_run :focus => true
-        config.filter.should eq({:focus => true})
+        config.filter[:focus].should == true
       end
-      
+
+      it "merges with existing filters" do
+        config.filter_run :filter1 => true
+        config.filter_run :filter2 => false
+
+        config.filter[:filter1].should == true
+        config.filter[:filter2].should == false
+      end
+
       it "warns if :line_number is already a filter" do
         config.filter_run :line_number => 100
         config.should_receive(:warn).with(
@@ -379,7 +420,7 @@ module RSpec::Core
         )
         config.filter_run :focus => true
       end
-      
+
       it "warns if :full_description is already a filter" do
         config.filter_run :full_description => 'foo'
         config.should_receive(:warn).with(
@@ -393,13 +434,55 @@ module RSpec::Core
     describe "#filter_run_excluding" do
       it "sets the filter" do
         config.filter_run_excluding :slow => true
-        config.exclusion_filter.should eq({:slow => true})
+        config.exclusion_filter[:slow].should == true
+      end
+
+      it "merges with existing filters" do
+        config.filter_run_excluding :filter1 => true
+        config.filter_run_excluding :filter2 => false
+
+        config.exclusion_filter[:filter1].should == true
+        config.exclusion_filter[:filter2].should == false
+      end
+    end
+
+    describe "#exclusion_filter" do
+      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
+        end
+
+        it "does not exclude a spec with { :if => true } metadata" do
+          config.exclusion_filter[:if].call(true, {:if => true}).should be_false
+        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
+        end
+      end
+
+      describe "the default :unless filter" do
+        it "excludes a spec with  { :unless => true } metadata" do
+          config.exclusion_filter[:unless].call(true).should be_true
+        end
+
+        it "does not exclude a spec with { :unless => false } metadata" do
+          config.exclusion_filter[:unless].call(false).should be_false
+        end
+
+        it "does not exclude a spec with { :unless => nil } metadata" do
+          config.exclusion_filter[:unless].call(nil).should be_false
+        end
       end
     end
 
     describe "line_number=" do
       before { config.stub(:warn) }
-      
+
       it "sets the line number" do
         config.line_number = '37'
         config.filter.should == {:line_number => 37}

data/spec/rspec/core/deprecations_spec.rb

@@ -16,7 +16,7 @@ describe "deprecations" do
   describe RSpec::Core::ExampleGroup do
     describe 'running_example' do
       it 'is deprecated' do
-        RSpec.should_receive(:warn_deprecation).with(/running_example.*example/m)
+        RSpec.should_receive(:warn_deprecation)
         self.running_example
       end
 
@@ -26,4 +26,20 @@ describe "deprecations" do
       end
     end
   end
+
+  describe "Spec::Runner.configure" do
+    it "is deprecated" do
+      RSpec.stub(:warn_deprecation)
+      RSpec.should_receive(:deprecate)
+      Spec::Runner.configure
+    end
+  end
+
+  describe "Spec::Rake::SpecTask" do
+    it "is deprecated" do
+      RSpec.stub(:warn_deprecation)
+      RSpec.should_receive(:deprecate)
+      Spec::Rake::SpecTask
+    end
+  end
 end

data/spec/rspec/core/example_group_spec.rb

@@ -70,16 +70,22 @@ module RSpec::Core
       end
 
       it "is not registered in world" do
+        world = RSpec::Core::World.new
         parent = ExampleGroup.describe
+        world.register(parent)
         child = parent.describe
-        RSpec.world.example_groups.should == [parent]
+        world.example_groups.should == [parent]
       end
     end
 
     describe "filtering" do
+      let(:world) { World.new }
+
       it "includes all examples in an explicitly included group" do
-        RSpec.world.stub(:inclusion_filter).and_return({ :awesome => true })
+        world.stub(:inclusion_filter).and_return({ :awesome => true })
         group = ExampleGroup.describe("does something", :awesome => true)
+        group.stub(:world) { world }
+
         examples = [
           group.example("first"),
           group.example("second")
@@ -88,16 +94,19 @@ module RSpec::Core
       end
 
       it "includes explicitly included examples" do
-        RSpec.world.stub(:inclusion_filter).and_return({ :include_me => true })
+        world.stub(:inclusion_filter).and_return({ :include_me => true })
         group = ExampleGroup.describe
+        group.stub(:world) { world }
         example = group.example("does something", :include_me => true)
         group.example("don't run me")
         group.filtered_examples.should == [example]
       end
 
       it "excludes all examples in an excluded group" do
-        RSpec.world.stub(:exclusion_filter).and_return({ :include_me => false })
+        world.stub(:exclusion_filter).and_return({ :include_me => false })
         group = ExampleGroup.describe("does something", :include_me => false)
+        group.stub(:world) { world }
+
         examples = [
           group.example("first"),
           group.example("second")
@@ -106,8 +115,10 @@ module RSpec::Core
       end
 
       it "filters out excluded examples" do
-        RSpec.world.stub(:exclusion_filter).and_return({ :exclude_me => true })
+        world.stub(:exclusion_filter).and_return({ :exclude_me => true })
         group = ExampleGroup.describe("does something")
+        group.stub(:world) { world }
+
         examples = [
           group.example("first", :exclude_me => true),
           group.example("second")
@@ -118,6 +129,7 @@ module RSpec::Core
       context "with no filters" do
         it "returns all" do
           group = ExampleGroup.describe
+          group.stub(:world) { world }
           example = group.example("does something")
           group.filtered_examples.should == [example]
         end
@@ -125,8 +137,9 @@ module RSpec::Core
 
       context "with no examples or groups that match filters" do
         it "returns none" do
-          RSpec.world.stub(:inclusion_filter).and_return({ :awesome => false })
+          world.stub(:inclusion_filter).and_return({ :awesome => false })
           group = ExampleGroup.describe
+          group.stub(:world) { world }
           example = group.example("does something")
           group.filtered_examples.should == []
         end
@@ -626,10 +639,13 @@ module RSpec::Core
         its([:another_attribute]) { should == 'another_value' }
         its([:another_attribute]) { should_not == 'value' }
         its(:keys) { should =~ ['another_attribute', :attribute] }
-
         context "when referring to an attribute without the proper array syntax" do
-          it "raises a NoMethodError" do
-            expect{ its(:attribute) }.to raise_error(NoMethodError)
+          context "it raises an error" do
+            its(:attribute) do
+              expect do
+                should eq('value')
+              end.to raise_error(NoMethodError)
+            end
           end
         end
       end
@@ -687,20 +703,20 @@ module RSpec::Core
       end
 
       context "with RSpec.wants_to_quit=true" do
+        let(:group) { RSpec::Core::ExampleGroup.describe }
+
         before do
-          RSpec.world.stub(:example_groups) { [] }
-          RSpec.world.stub(:wants_to_quit) { true }
+          RSpec.stub(:wants_to_quit) { true }
+          RSpec.stub(:clear_remaining_example_groups)
         end
 
         it "returns without starting the group" do
-          group = RSpec::Core::ExampleGroup.describe
           reporter.should_not_receive(:example_group_started)
           group.run(reporter)
         end
 
         context "at top level" do
           it "purges remaining groups" do
-            group = RSpec::Core::ExampleGroup.describe
             RSpec.should_receive(:clear_remaining_example_groups)
             group.run(reporter)
           end
@@ -708,7 +724,6 @@ module RSpec::Core
 
         context "in a nested group" do
           it "does not purge remaining groups" do
-            group = RSpec::Core::ExampleGroup.describe
             nested_group = group.describe
             RSpec.should_not_receive(:clear_remaining_example_groups)
             nested_group.run(reporter)

data/spec/rspec/core/example_spec.rb

@@ -9,13 +9,6 @@ describe RSpec::Core::Example, :parent_metadata => 'sample' do
     example_group.example('example description')
   end
 
-  describe "#behaviour" do
-    it "is deprecated" do
-      RSpec.should_receive(:deprecate)
-      example_instance.behaviour
-    end
-  end
-
   describe '#described_class' do
     it "returns the class (if any) of the outermost example group" do
       described_class.should == RSpec::Core::Example

data/spec/rspec/core/formatters/html_formatted-1.8.6.html

@@ -184,7 +184,7 @@ a {
   <dt id="example_group_1">pending spec with no implementation</dt>
     <script type="text/javascript">makeYellow('rspec-header');</script>
     <script type="text/javascript">makeYellow('example_group_1');</script>
-    <script type="text/javascript">moveProgressBar('20.0');</script>
+    <script type="text/javascript">moveProgressBar('14.2');</script>
     <dd class="spec not_implemented"><span class="not_implemented_spec_name">is pending (PENDING: Not Yet Implemented)</span></dd>
   </dl>
 </div>
@@ -198,7 +198,7 @@ a {
   <dt id="example_group_3">with content that would fail</dt>
     <script type="text/javascript">makeYellow('rspec-header');</script>
     <script type="text/javascript">makeYellow('example_group_3');</script>
-    <script type="text/javascript">moveProgressBar('40.0');</script>
+    <script type="text/javascript">moveProgressBar('28.5');</script>
     <dd class="spec not_implemented"><span class="not_implemented_spec_name">is pending (PENDING: No reason given)</span></dd>
   </dl>
 </div>
@@ -207,27 +207,23 @@ a {
   <dt id="example_group_4">with content that would pass</dt>
     <script type="text/javascript">makeRed('rspec-header');</script>
     <script type="text/javascript">makeRed('example_group_4');</script>
-    <script type="text/javascript">moveProgressBar('60.0');</script>
+    <script type="text/javascript">moveProgressBar('42.8');</script>
     <dd class="spec pending_fixed">
       <span class="failed_spec_name">fails</span>
       <div class="failure" id="failure_0">
         <div class="message"><pre>RSpec::Core::PendingExampleFixedError</pre></div>
-        <div class="backtrace"><pre>./spec/rspec/core/resources/formatter_specs.rb:19
-./spec/rspec/core/formatters/html_formatter_spec.rb:23
-./spec/rspec/core/formatters/html_formatter_spec.rb:43
-./spec/rspec/core/formatters/html_formatter_spec.rb:43:in `open'
-./spec/rspec/core/formatters/html_formatter_spec.rb:43
-./spec/rspec/core/formatters/html_formatter_spec.rb:42:in `chdir'
-./spec/rspec/core/formatters/html_formatter_spec.rb:42
-./spec/spec_helper.rb:70:in `__instance_exec0'
-./spec/spec_helper.rb:46:in `instance_eval'
-./spec/spec_helper.rb:46:in `sandboxed'
-./spec/spec_helper.rb:70:in `__instance_exec0'</pre></div>
-    <pre class="ruby"><code><span class="linenum">11</span>          <span class="keyword">rescue</span> <span class="constant">Exception</span> <span class="punct">=&gt;</span> <span class="ident">e</span>
-<span class="linenum">12</span>          <span class="keyword">end</span>
-<span class="offending"><span class="linenum">13</span>          <span class="keyword">raise</span> <span class="constant">RSpec</span><span class="punct">::</span><span class="constant">Core</span><span class="punct">::</span><span class="constant">PendingExampleFixedError</span><span class="punct">.</span><span class="ident">new</span> <span class="keyword">if</span> <span class="ident">result</span></span>
-<span class="linenum">14</span>        <span class="keyword">end</span>
-<span class="linenum">15</span>        <span class="ident">throw</span> <span class="symbol">:pending_declared_in_example</span><span class="punct">,</span> <span class="ident">message</span></code></pre>
+        <div class="backtrace"><pre>./spec/rspec/core/resources/formatter_specs.rb:18
+./spec/rspec/core/formatters/html_formatter_spec.rb:24
+./spec/rspec/core/formatters/html_formatter_spec.rb:46
+./spec/rspec/core/formatters/html_formatter_spec.rb:46:in `open'
+./spec/rspec/core/formatters/html_formatter_spec.rb:46
+./spec/rspec/core/formatters/html_formatter_spec.rb:45:in `chdir'
+./spec/rspec/core/formatters/html_formatter_spec.rb:45</pre></div>
+    <pre class="ruby"><code><span class="linenum">20</span>          <span class="keyword">rescue</span> <span class="constant">Exception</span> <span class="punct">=&gt;</span> <span class="ident">e</span>
+<span class="linenum">21</span>          <span class="keyword">end</span>
+<span class="offending"><span class="linenum">22</span>          <span class="keyword">raise</span> <span class="constant">RSpec</span><span class="punct">::</span><span class="constant">Core</span><span class="punct">::</span><span class="constant">PendingExampleFixedError</span><span class="punct">.</span><span class="ident">new</span> <span class="keyword">if</span> <span class="ident">result</span></span>
+<span class="linenum">23</span>        <span class="keyword">end</span>
+<span class="linenum">24</span>        <span class="ident">throw</span> <span class="symbol">:pending_declared_in_example</span><span class="punct">,</span> <span class="ident">message</span></code></pre>
       </div>
     </dd>
   </dl>
@@ -235,7 +231,7 @@ a {
 <div class="example_group">
   <dl>
   <dt id="example_group_5">passing spec</dt>
-    <script type="text/javascript">moveProgressBar('80.0');</script>
+    <script type="text/javascript">moveProgressBar('57.1');</script>
     <dd class="spec passed"><span class="passed_spec_name">passes</span></dd>
   </dl>
 </div>
@@ -243,7 +239,7 @@ a {
   <dl>
   <dt id="example_group_6">failing spec</dt>
     <script type="text/javascript">makeRed('example_group_6');</script>
-    <script type="text/javascript">moveProgressBar('100.0');</script>
+    <script type="text/javascript">moveProgressBar('71.4');</script>
     <dd class="spec failed">
       <span class="failed_spec_name">fails</span>
       <div class="failure" id="failure_0">
@@ -253,17 +249,13 @@ expected 2
 
 (compared using ==)
 </pre></div>
-        <div class="backtrace"><pre>./spec/rspec/core/resources/formatter_specs.rb:34
-./spec/rspec/core/formatters/html_formatter_spec.rb:23
-./spec/rspec/core/formatters/html_formatter_spec.rb:43
-./spec/rspec/core/formatters/html_formatter_spec.rb:43:in `open'
-./spec/rspec/core/formatters/html_formatter_spec.rb:43
-./spec/rspec/core/formatters/html_formatter_spec.rb:42:in `chdir'
-./spec/rspec/core/formatters/html_formatter_spec.rb:42
-./spec/spec_helper.rb:70:in `__instance_exec0'
-./spec/spec_helper.rb:46:in `instance_eval'
-./spec/spec_helper.rb:46:in `sandboxed'
-./spec/spec_helper.rb:70:in `__instance_exec0'</pre></div>
+        <div class="backtrace"><pre>./spec/rspec/core/resources/formatter_specs.rb:33
+./spec/rspec/core/formatters/html_formatter_spec.rb:24
+./spec/rspec/core/formatters/html_formatter_spec.rb:46
+./spec/rspec/core/formatters/html_formatter_spec.rb:46:in `open'
+./spec/rspec/core/formatters/html_formatter_spec.rb:46
+./spec/rspec/core/formatters/html_formatter_spec.rb:45:in `chdir'
+./spec/rspec/core/formatters/html_formatter_spec.rb:45</pre></div>
     <pre class="ruby"><code><span class="linenum">27</span>        <span class="keyword">end</span>
 <span class="linenum">28</span>
 <span class="offending"><span class="linenum">29</span>        <span class="keyword">raise</span><span class="punct">(</span><span class="constant">RSpec</span><span class="punct">::</span><span class="constant">Expectations</span><span class="punct">::</span><span class="constant">ExpectationNotMetError</span><span class="punct">.</span><span class="ident">new</span><span class="punct">(</span><span class="ident">message</span><span class="punct">))</span></span>
@@ -272,8 +264,32 @@ expected 2
     </dd>
   </dl>
 </div>
+<div class="example_group">
+  <dl>
+  <dt id="example_group_7">a failing spec with odd backtraces</dt>
+    <script type="text/javascript">makeRed('example_group_7');</script>
+    <script type="text/javascript">moveProgressBar('85.7');</script>
+    <dd class="spec failed">
+      <span class="failed_spec_name">fails with a backtrace that has no file</span>
+      <div class="failure" id="failure_0">
+        <div class="message"><pre>foo</pre></div>
+        <div class="backtrace"><pre>(erb):1</pre></div>
+    <pre class="ruby"><code><span class="linenum">-1</span><span class="comment"># Couldn't get snippet for (erb)</span></code></pre>
+      </div>
+    </dd>
+    <script type="text/javascript">moveProgressBar('100.0');</script>
+    <dd class="spec failed">
+      <span class="failed_spec_name">fails with a backtrace containing an erb file</span>
+      <div class="failure" id="failure_0">
+        <div class="message"><pre>Exception</pre></div>
+        <div class="backtrace"><pre>/foo.html.erb:1:in `<main>': foo (RuntimeError)</pre></div>
+    <pre class="ruby"><code><span class="linenum">-1</span><span class="comment"># Couldn't get snippet for /foo.html.erb</span></code></pre>
+      </div>
+    </dd>
+  </dl>
+</div>
 <script type="text/javascript">document.getElementById('duration').innerHTML = "Finished in <strong>x seconds</strong>";</script>
-<script type="text/javascript">document.getElementById('totals').innerHTML = "5 examples, 2 failures, 2 pending";</script>
+<script type="text/javascript">document.getElementById('totals').innerHTML = "7 examples, 4 failures, 2 pending";</script>
 </div>
 </div>
 </body>