rspec-core 2.14.8 → 2.99.0.beta1

data/spec/rspec/core/deprecation_spec.rb

@@ -2,38 +2,19 @@ require "spec_helper"
 
 describe RSpec::Core::Deprecation do
   describe "#deprecate" do
-    context "old API with individual args" do
-      it "includes the method to deprecate" do
-        expect(RSpec.configuration.reporter).to receive(:deprecation).with(hash_including :deprecated => "deprecated_method")
-        RSpec.deprecate("deprecated_method")
-      end
-
-      it "includes the replacement when provided" do
-        expect(RSpec.configuration.reporter).to receive(:deprecation).with(hash_including :deprecated => "deprecated_method", :replacement => "replacement")
-        RSpec.deprecate("deprecated_method", "replacement")
-      end
-
-      it "adds the call site" do
-        expect_deprecation_with_call_site(__FILE__, __LINE__ + 1)
-        RSpec.deprecate("deprecated_method")
-      end
-
-      it "doesn't override the existing callsite" do
-        expect(RSpec.configuration.reporter).to receive(:deprecation).with(hash_including :call_site => "/path")
-        RSpec.deprecate("deprecated_method", :call_site => "/path")
-      end
+    it "passes the hash to the reporter" do
+      expect(RSpec.configuration.reporter).to receive(:deprecation).with(hash_including :deprecated => "deprecated_method", :replacement => "replacement")
+      RSpec.deprecate("deprecated_method", :replacement => "replacement")
     end
 
-    context "new API with a hash after the first arg" do
-      it "passes the hash to the reporter" do
-        expect(RSpec.configuration.reporter).to receive(:deprecation).with(hash_including :deprecated => "deprecated_method", :replacement => "replacement")
-        RSpec.deprecate("deprecated_method", :replacement => "replacement")
-      end
+    it "adds the call site" do
+      expect_deprecation_with_call_site(__FILE__, __LINE__ + 1)
+      RSpec.deprecate("deprecated_method")
+    end
 
-      it "adds the call site" do
-        expect_deprecation_with_call_site(__FILE__, __LINE__ + 1)
-        RSpec.deprecate("deprecated_method")
-      end
+    it "doesn't override a passed call site" do
+      expect_deprecation_with_call_site("some_file.rb", 17)
+      RSpec.deprecate("deprecated_method", :call_site => "/some_file.rb:17")
     end
   end
 

data/spec/rspec/core/deprecations_spec.rb

@@ -23,20 +23,6 @@ describe "deprecated methods" do
     end
   end
 
-  describe RSpec::Core::ExampleGroup do
-    describe 'running_example' do
-      it 'is deprecated' do
-        RSpec.should_receive(:deprecate).at_least(:once)
-        self.running_example
-      end
-
-      it "delegates to example" do
-        RSpec.stub(:deprecate)
-        expect(running_example).to eq(example)
-      end
-    end
-  end
-
   describe RSpec::Core::SharedExampleGroup do
     describe 'share_as' do
       it 'is deprecated' do

data/spec/rspec/core/example_group_spec.rb

@@ -29,6 +29,7 @@ module RSpec::Core
 
     context 'when RSpec.configuration.treat_symbols_as_metadata_keys_with_true_values is set to false' do
       before(:each) do
+        allow_deprecation
         RSpec.configure { |c| c.treat_symbols_as_metadata_keys_with_true_values = false }
       end
 
@@ -65,8 +66,8 @@ module RSpec::Core
         examples_run = []
         group = ExampleGroup.describe("parent") do
           describe("child") do
-            it "does something" do
-              examples_run << example
+            it "does something" do |ex|
+              examples_run << ex
             end
           end
         end
@@ -79,13 +80,13 @@ module RSpec::Core
         it "runs its children " do
           examples_run = []
           group = ExampleGroup.describe("parent") do
-            it "fails" do
-              examples_run << example
+            it "fails" do |ex|
+              examples_run << ex
               raise "fail"
             end
             describe("child") do
-              it "does something" do
-                examples_run << example
+              it "does something" do |ex|
+                examples_run << ex
               end
             end
           end
@@ -298,7 +299,7 @@ module RSpec::Core
               end
             end
 
-            expect(group.run).to be_true
+            expect(group.run).to be_truthy
           end
         end
 
@@ -314,7 +315,7 @@ module RSpec::Core
               end
             end
 
-            expect(group.run).to be_true
+            expect(group.run).to be_truthy
           end
         end
       end
@@ -329,7 +330,7 @@ module RSpec::Core
             end
           end
 
-          expect(group.run).to be_true, "expected examples in group to pass"
+          expect(group.run).to be_truthy, "expected examples in group to pass"
         end
       end
 
@@ -402,11 +403,11 @@ module RSpec::Core
         let(:focused_example) { ExampleGroup.describe.send example_alias, "a focused example" }
 
         it 'defines an example that can be filtered with :focused => true' do
-          expect(focused_example.metadata[:focused]).to be_true
+          expect(focused_example.metadata[:focused]).to be_truthy
         end
 
         it 'defines an example that can be filtered with :focus => true' do
-          expect(focused_example.metadata[:focus]).to be_true
+          expect(focused_example.metadata[:focus]).to be_truthy
         end
       end
     end
@@ -431,7 +432,7 @@ module RSpec::Core
         group.example("example") {}
 
         group.run
-        expect(RSpec.wants_to_quit).to be_false
+        expect(RSpec.wants_to_quit).to be_falsey
       end
 
       it "runs the before eachs in order" do
@@ -594,7 +595,7 @@ module RSpec::Core
         group = ExampleGroup.describe
         group.before(:all) { raise "error in before all" }
         example = group.example("equality") { expect(1).to eq(2) }
-        expect(group.run).to be_false
+        expect(group.run).to be_falsey
 
         expect(example.metadata).not_to be_nil
         expect(example.metadata[:execution_result]).not_to be_nil
@@ -673,19 +674,10 @@ module RSpec::Core
         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
-        expect(running_example).to be(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.before(:each) {|ex| option = ex.options[:data] }
         group.example("no-op", :data => :sample) { }
         group.run
         expect(option).to eq(:sample)
@@ -694,20 +686,11 @@ module RSpec::Core
       it "has access to example options within after(:each)" do
         group = ExampleGroup.describe
         option = nil
-        group.after(:each) { option = example.options[:data] }
+        group.after(:each) {|ex| option = ex.options[:data] }
         group.example("no-op", :data => :sample) { }
         group.run
         expect(option).to eq(: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
-        expect(running_example).to be(nil)
-      end
     end
 
     %w[pending xit xspecify xexample].each do |method_name|
@@ -765,20 +748,20 @@ module RSpec::Core
     describe Object, "describing nested example_groups", :little_less_nested => 'yep' do
 
       describe "A sample nested group", :nested_describe => "yep" do
-        it "sets the described class to the described class of the outer most group" do
-          expect(example.example_group.described_class).to eq(ExampleGroup)
+        it "sets the described class to the described class of the outer most group" do |ex|
+          expect(ex.example_group.described_class).to eq(ExampleGroup)
         end
 
-        it "sets the description to 'A sample nested describe'" do
-          expect(example.example_group.description).to eq('A sample nested group')
+        it "sets the description to 'A sample nested describe'" do |ex|
+          expect(ex.example_group.description).to eq('A sample nested group')
         end
 
-        it "has top level metadata from the example_group and its parent groups" do
-          expect(example.example_group.metadata).to include(:little_less_nested => 'yep', :nested_describe => 'yep')
+        it "has top level metadata from the example_group and its parent groups" do |ex|
+          expect(ex.example_group.metadata).to include(:little_less_nested => 'yep', :nested_describe => 'yep')
         end
 
-        it "exposes the parent metadata to the contained examples" do
-          expect(example.metadata).to include(:little_less_nested => 'yep', :nested_describe => 'yep')
+        it "exposes the parent metadata to the contained examples" do |ex|
+          expect(ex.metadata).to include(:little_less_nested => 'yep', :nested_describe => 'yep')
         end
       end
 
@@ -794,7 +777,7 @@ module RSpec::Core
           example('ex 2') { expect(1).to eq(1) }
         end
         group.stub(:filtered_examples) { group.examples.extend(Extensions::Ordered::Examples) }
-        expect(group.run(reporter)).to be_true
+        expect(group.run(reporter)).to be_truthy
       end
 
       it "returns false if any of the examples fail" do
@@ -803,7 +786,7 @@ module RSpec::Core
           example('ex 2') { expect(1).to eq(2) }
         end
         group.stub(:filtered_examples) { group.examples.extend(Extensions::Ordered::Examples) }
-        expect(group.run(reporter)).to be_false
+        expect(group.run(reporter)).to be_falsey
       end
 
       it "runs all examples, regardless of any of them failing" do
@@ -815,7 +798,7 @@ module RSpec::Core
         group.filtered_examples.each do |example|
           example.should_receive(:run)
         end
-        expect(group.run(reporter)).to be_false
+        expect(group.run(reporter)).to be_falsey
       end
     end
 
@@ -836,12 +819,12 @@ module RSpec::Core
         expect(@before_all_top_level).to eq('before_all_top_level')
       end
 
-      it "can access the before all ivars in the before_all_ivars hash", :ruby => 1.8 do
-        expect(example.example_group.before_all_ivars).to include('@before_all_top_level' => 'before_all_top_level')
+      it "can access the before all ivars in the before_all_ivars hash", :ruby => 1.8 do |ex|
+        expect(ex.example_group.before_all_ivars).to include('@before_all_top_level' => 'before_all_top_level')
       end
 
-      it "can access the before all ivars in the before_all_ivars hash", :ruby => 1.9 do
-        expect(example.example_group.before_all_ivars).to include(:@before_all_top_level => 'before_all_top_level')
+      it "can access the before all ivars in the before_all_ivars hash", :ruby => 1.9 do |ex|
+        expect(ex.example_group.before_all_ivars).to include(:@before_all_top_level => 'before_all_top_level')
       end
 
       describe "but now I am nested" do
@@ -869,12 +852,12 @@ module RSpec::Core
     describe "ivars are not shared across examples" do
       it "(first example)" do
         @a = 1
-        expect(defined?(@b)).to be_false
+        expect(defined?(@b)).to be_falsey
       end
 
       it "(second example)" do
         @b = 2
-        expect(defined?(@a)).to be_false
+        expect(defined?(@a)).to be_falsey
       end
     end
 
@@ -917,8 +900,8 @@ module RSpec::Core
         it "sets RSpec.wants_to_quit flag if encountering an exception in before(:all)" do
           group.before(:all) { raise "error in before all" }
           group.example("equality") { expect(1).to eq(2) }
-          expect(group.run).to be_false
-          expect(RSpec.wants_to_quit).to be_true
+          expect(group.run).to be_falsey
+          expect(RSpec.wants_to_quit).to be_truthy
         end
       end
 
@@ -964,7 +947,7 @@ module RSpec::Core
             end
           end
 
-          expect(group.run(reporter)).to be_true
+          expect(group.run(reporter)).to be_truthy
         end
       end
 
@@ -981,7 +964,7 @@ module RSpec::Core
             end
           end
 
-          expect(group.run(reporter)).to be_false
+          expect(group.run(reporter)).to be_falsey
         end
       end
 
@@ -998,7 +981,7 @@ module RSpec::Core
             end
           end
 
-          expect(group.run(reporter)).to be_false
+          expect(group.run(reporter)).to be_falsey
         end
       end
     end
@@ -1070,7 +1053,42 @@ module RSpec::Core
               def foo; "bar"; end
             end
           end
-          expect(group.run).to be_true
+          expect(group.run).to be_truthy
+        end
+
+        it "warns when extra args are submitted to a zero-arity shared block", :if => RUBY_VERSION.to_f >= 1.9 do
+          group = ExampleGroup.describe
+          group.shared_examples("named this") {}
+
+          expect(group).to receive(:warn) {|message|
+            expect(message).to match(/expected 0 args/)
+            expect(message).to match(/called from #{__FILE__}:#{__LINE__ + 2}/)
+          }
+          group.send(name, "named this", "extra arg")
+        end
+
+        it "warns with usage message when 2nd arg is the name of another shared group", :if => RUBY_VERSION.to_f >= 1.9 do
+          group = ExampleGroup.describe
+          group.shared_examples("named this") {}
+          group.shared_examples("named that") {}
+
+          expect(group).to receive(:warn) {|message|
+            expect(message).to match(/shared (context|examples) supports? the name of only one example group, received \["named this", "named that"\]/)
+            expect(message).to match(/called from #{__FILE__}:#{__LINE__ + 2}/)
+          }
+          group.send(name, "named this", "named that")
+        end
+
+        it 'does not warn when the shared example group has a default arg', :if => RUBY_VERSION.to_f >= 1.9 do
+          group = ExampleGroup.describe
+
+          # 1.8.7 can't parse blocks with arg defaults, so we have to eval it
+          # to delay when it is parsed.
+          eval('group.shared_examples("named this") { |opts={}| }')
+
+          expect(group).not_to receive(:warn)
+
+          group.send(name, "named this", :foo => 1)
         end
       end
     end

data/spec/rspec/core/example_spec.rb

@@ -27,13 +27,15 @@ describe RSpec::Core::Example, :parent_metadata => 'sample' do
     $stdout = orig_stdout
   end
 
-  it 'can be pretty printed' do
+  it "can be pretty printed" do
     output = ignoring_warnings { capture_stdout { pp example_instance } }
     expect(output).to include("RSpec::Core::Example")
   end
 
   describe "#exception" do
     it "supplies the first exception raised, if any" do
+      RSpec.configuration.output_stream = StringIO.new
+
       example = example_group.example { raise "first" }
       example_group.after { raise "second" }
       example_group.run
@@ -150,26 +152,26 @@ describe RSpec::Core::Example, :parent_metadata => 'sample' do
     end
   end
 
-  describe '#described_class' do
+  describe "#described_class" do
     it "returns the class (if any) of the outermost example group" do
       expect(described_class).to eq(RSpec::Core::Example)
     end
   end
 
   describe "accessing metadata within a running example" do
-    it "has a reference to itself when running" do
-      expect(example.description).to eq("has a reference to itself when running")
+    it "has a reference to itself when running" do |ex|
+      expect(ex.description).to eq("has a reference to itself when running")
     end
 
-    it "can access the example group's top level metadata as if it were its own" do
-      expect(example.example_group.metadata).to include(:parent_metadata => 'sample')
-      expect(example.metadata).to include(:parent_metadata => 'sample')
+    it "can access the example group's top level metadata as if it were its own" do |ex|
+      expect(ex.example_group.metadata).to include(:parent_metadata => 'sample')
+      expect(ex.metadata).to include(:parent_metadata => 'sample')
     end
   end
 
   describe "accessing options within a running example" do
-    it "can look up option values by key", :demo => :data do
-      expect(example.metadata[:demo]).to eq(:data)
+    it "can look up option values by key", :demo => :data do |ex|
+      expect(ex.metadata[:demo]).to eq(:data)
     end
   end
 
@@ -189,7 +191,7 @@ describe RSpec::Core::Example, :parent_metadata => 'sample' do
         example('example') { expect(1).to eq(1) }
       end
       group.run
-      expect(after_run).to be_true, "expected after(:each) to be run"
+      expect(after_run).to be_truthy, "expected after(:each) to be run"
     end
 
     it "runs after(:each) when the example fails" do
@@ -199,7 +201,7 @@ describe RSpec::Core::Example, :parent_metadata => 'sample' do
         example('example') { expect(1).to eq(2) }
       end
       group.run
-      expect(after_run).to be_true, "expected after(:each) to be run"
+      expect(after_run).to be_truthy, "expected after(:each) to be run"
     end
 
     it "runs after(:each) when the example raises an Exception" do
@@ -209,7 +211,7 @@ describe RSpec::Core::Example, :parent_metadata => 'sample' do
         example('example') { raise "this error" }
       end
       group.run
-      expect(after_run).to be_true, "expected after(:each) to be run"
+      expect(after_run).to be_truthy, "expected after(:each) to be run"
     end
 
     context "with an after(:each) that raises" do
@@ -221,7 +223,7 @@ describe RSpec::Core::Example, :parent_metadata => 'sample' do
           example('example') { expect(1).to eq(1) }
         end
         group.run
-        expect(after_run).to be_true, "expected after(:each) to be run"
+        expect(after_run).to be_truthy, "expected after(:each) to be run"
       end
 
       it "stores the exception" do
@@ -270,7 +272,7 @@ describe RSpec::Core::Example, :parent_metadata => 'sample' do
           expect(@before_all).to eq(:before_all)
           expect(@before_each).to eq(:before_each)
         end
-        expect(group.run(double.as_null_object)).to be_true
+        expect(group.run(double.as_null_object)).to be_truthy
         group.new do |example|
           %w[@before_all @before_each @after_each @after_all].each do |ivar|
             expect(example.instance_variable_get(ivar)).to be_nil
@@ -284,7 +286,7 @@ describe RSpec::Core::Example, :parent_metadata => 'sample' do
           example("first") { expect(@before_all).not_to be_nil }
           example("second") { expect(@before_all).not_to be_nil }
         end
-        expect(group.run).to be_true
+        expect(group.run).to be_truthy
       end
     end
 
@@ -319,7 +321,7 @@ describe RSpec::Core::Example, :parent_metadata => 'sample' do
         expect(message).to match(/An error occurred in an after.* hook/i)
       end
 
-      it 'does not print mock expectation errors' do
+      it "does not print mock expectation errors" do
         group = RSpec::Core::ExampleGroup.describe do
           example do
             foo = double
@@ -448,7 +450,7 @@ describe RSpec::Core::Example, :parent_metadata => 'sample' do
     end
   end
 
-  it 'does not interfere with per-example randomness when running examples in a random order' do
+  it "does not interfere with per-example randomness when running examples in a random order" do
     values = []
 
     RSpec.configuration.order = :random
@@ -462,4 +464,39 @@ describe RSpec::Core::Example, :parent_metadata => 'sample' do
 
     expect(values.uniq).to have(2).values
   end
+
+  describe "optional block argument" do
+    it "contains the example" do |ex|
+      expect(ex).to be_an(RSpec::Core::Example)
+      expect(ex.description).to match(/contains the example/)
+    end
+  end
+
+  %w[example running_example].each do |accessor|
+    describe accessor do
+      before { allow_deprecation }
+
+      it "is deprecated" do
+        expect_warn_deprecation_with_call_site(__FILE__, __LINE__ + 1, /#{accessor}/)
+        send(accessor)
+      end
+
+      it "returns the current running example" do |ex|
+        expect(send(accessor)).to eq ex
+      end
+    end
+  end
+
+  describe "setting the current example" do
+    it "sets RSpec.current_example to the example that is currently running" do
+      group = RSpec::Core::ExampleGroup.describe("an example group")
+
+      current_examples = []
+      example1 = group.example("example 1") { current_examples << RSpec.current_example }
+      example2 = group.example("example 2") { current_examples << RSpec.current_example }
+
+      group.run
+      expect(current_examples).to eq([example1, example2])
+    end
+  end
 end