rspec-core 2.5.2 → 2.6.0.rc2

data/features/hooks/around_hooks.feature

@@ -30,7 +30,7 @@ Feature: around hooks
         end
       end
       """
-    When I run "rspec example_spec.rb"
+    When I run `rspec example_spec.rb`
     Then the output should contain:
       """
       open transaction
@@ -53,7 +53,7 @@ Feature: around hooks
         end
       end
       """
-    When I run "rspec example_spec.rb"
+    When I run `rspec example_spec.rb`
     Then the output should contain:
       """
       around each before
@@ -74,7 +74,7 @@ Feature: around hooks
         end
       end
       """
-    When I run "rspec example_spec.rb"
+    When I run `rspec example_spec.rb`
     Then the output should contain "this should show up in the output"
 
   Scenario: define a global around hook
@@ -94,7 +94,7 @@ Feature: around hooks
         end
       end
       """
-    When I run "rspec example_spec.rb"
+    When I run `rspec example_spec.rb`
     Then the output should contain:
       """
       around each before
@@ -125,7 +125,7 @@ Feature: around hooks
         end
       end
       """
-    When I run "rspec example_spec.rb"
+    When I run `rspec example_spec.rb`
     Then the output should contain:
       """
       around each before
@@ -158,7 +158,7 @@ Feature: around hooks
         end
       end
       """
-    When I run "rspec example_spec.rb"
+    When I run `rspec example_spec.rb`
     Then the output should contain:
       """
       before all
@@ -189,7 +189,7 @@ Feature: around hooks
         end
       end
       """
-    When I run "rspec example_spec.rb"
+    When I run `rspec example_spec.rb`
     Then the output should contain "1 example, 0 failure"
 
   Scenario: implicitly pending examples are detected as Not Yet Implemented
@@ -203,7 +203,7 @@ Feature: around hooks
         it "should be detected as Not Yet Implemented"
       end
       """
-    When I run "rspec example_spec.rb"
+    When I run `rspec example_spec.rb`
     Then the output should contain "1 example, 0 failures, 1 pending"
     And the output should contain:
       """
@@ -226,7 +226,7 @@ Feature: around hooks
         end
       end
       """
-    When I run "rspec example_spec.rb"
+    When I run `rspec example_spec.rb`
     Then the output should contain "1 example, 0 failures, 1 pending"
     And the output should contain:
       """
@@ -256,7 +256,7 @@ Feature: around hooks
         end
       end
       """
-    When I run "rspec example_spec.rb"
+    When I run `rspec example_spec.rb`
     Then the output should contain "1 example, 0 failure"
     And the output should contain:
       """
@@ -316,7 +316,7 @@ Feature: around hooks
       end
     end
     """
-    When I run "rspec example_spec.rb"
+    When I run `rspec example_spec.rb`
     Then the output should contain "1 example, 0 failure"
     And the output should contain:
     """

data/features/hooks/before_and_after_hooks.feature

@@ -52,7 +52,7 @@ Feature: before and after hooks
         end
       end
       """
-    When I run "rspec ./before_each_spec.rb"
+    When I run `rspec before_each_spec.rb`
     Then the examples should all pass
 
   Scenario: define before(:all) block in example group
@@ -86,10 +86,10 @@ Feature: before and after hooks
         end
       end
       """
-    When I run "rspec ./before_all_spec.rb"
+    When I run `rspec before_all_spec.rb`
     Then the examples should all pass
 
-    When I run "rspec ./before_all_spec.rb:15"
+    When I run `rspec before_all_spec.rb:15`
     Then the examples should all pass
 
   Scenario: failure in before(:all) block
@@ -124,7 +124,7 @@ Feature: before and after hooks
         end
       end
       """
-    When I run "rspec ./before_all_spec.rb --format documentation"
+    When I run `rspec before_all_spec.rb --format documentation`
     Then the output should contain "5 examples, 5 failures"
     And the output should contain:
       """
@@ -139,15 +139,12 @@ Feature: before and after hooks
       after all ran
       """
 
-    When I run "rspec ./before_all_spec.rb:9 --format documentation"
+    When I run `rspec before_all_spec.rb:9 --format documentation`
     Then the output should contain "1 example, 1 failure"
     And the output should contain:
       """
       an error in before(:all)
         fails this example, too (FAILED - 1)
-        nested group
-          yet another level deep
-      after all ran
       """
 
   Scenario: failure in after(:all) block
@@ -165,7 +162,7 @@ Feature: before and after hooks
         end
       end
       """
-    When I run "rspec after_all_spec.rb"
+    When I run `rspec after_all_spec.rb`
     Then the examples should all pass
     And the output should contain:
       """
@@ -200,7 +197,7 @@ Feature: before and after hooks
         end
       end
       """
-    When I run "rspec ./befores_in_configuration_spec.rb"
+    When I run `rspec befores_in_configuration_spec.rb`
     Then the examples should all pass
 
   Scenario: before/after blocks are run in order
@@ -230,7 +227,7 @@ Feature: before and after hooks
         end
       end
       """
-    When I run "rspec ./ensure_block_order_spec.rb"
+    When I run `rspec ensure_block_order_spec.rb`
     Then the output should contain:
       """
       before all
@@ -275,7 +272,7 @@ Feature: before and after hooks
         end
       end
       """
-    When I run "rspec configuration_spec.rb"
+    When I run `rspec configuration_spec.rb`
     Then the output should contain:
       """
       before suite
@@ -316,7 +313,7 @@ Feature: before and after hooks
 
       end
       """
-    When I run "rspec ./before_and_after_all_spec.rb"
+    When I run `rspec before_and_after_all_spec.rb`
     Then the examples should all pass
     And the output should contain:
       """
@@ -326,7 +323,7 @@ Feature: before and after hooks
       outer after all
       """
 
-    When I run "rspec ./before_and_after_all_spec.rb:14"
+    When I run `rspec before_and_after_all_spec.rb:14`
     Then the examples should all pass
     And the output should contain:
       """
@@ -336,7 +333,7 @@ Feature: before and after hooks
       outer after all
       """
 
-    When I run "rspec ./before_and_after_all_spec.rb:6"
+    When I run `rspec before_and_after_all_spec.rb:6`
     Then the examples should all pass
     And the output should contain:
       """
@@ -371,7 +368,7 @@ Feature: before and after hooks
         end
       end
       """
-    When I run "rspec before_all_spec.rb"
+    When I run `rspec before_all_spec.rb`
     Then the examples should all pass
 
   Scenario: before/after all blocks have access to state
@@ -402,12 +399,11 @@ Feature: before and after hooks
         end
 
         after(:all) do
-          # p @outer_state.nil?
           @outer_state.should eq("set in outer before all")
         end
       end
       """
-    When I run "rspec ./before_and_after_all_spec.rb"
+    When I run `rspec before_and_after_all_spec.rb`
     Then the examples should all pass
 
   Scenario: exception in before(:each) is captured and reported as failure
@@ -422,6 +418,6 @@ Feature: before and after hooks
         end
       end
       """
-    When I run "rspec ./error_in_before_each_spec.rb"
+    When I run `rspec error_in_before_each_spec.rb`
     Then the output should contain "1 example, 1 failure"
     And the output should contain "this error"

data/features/hooks/filtering.feature

@@ -5,187 +5,223 @@ Feature: filters
   or example group, and used to make a hook only apply to examples with the
   given metadata.
 
+  If you set the `treat_symbols_as_metadata_keys_with_true_values` config option
+  to `true`, you can specify metadata using only symbols.
+
   Scenario: filter `before(:each)` hooks using arbitrary metadata
     Given a file named "filter_before_each_hooks_spec.rb" with:
       """
       RSpec.configure do |config|
-        config.before(:each, :foo => :bar) { puts "In hook" }
+        config.before(:each, :foo => :bar) do
+          invoked_hooks << :before_each_foo_bar
+        end
       end
 
-      describe "group 1" do
-        it("example 1") { }
-        it("example 2", :foo => :bar) { }
-      end
+      describe "a filtered before :each hook" do
+        let(:invoked_hooks) { [] }
 
-      describe "group 2", :foo => :bar do
-        it("example 1") { }
-        it("example 2", :foo => :bar) { }
-      end
-      """
-    When I run "rspec filter_before_each_hooks_spec.rb --format documentation"
-    Then the output should contain:
-      """
-      group 1
-        example 1
-      In hook
-        example 2
+        describe "group without matching metadata" do
+          it "does not run the hook" do
+            invoked_hooks.should be_empty
+          end
 
-      group 2
-      In hook
-        example 1
-      In hook
-        example 2
+          it "runs the hook for an example with matching metadata", :foo => :bar do
+            invoked_hooks.should == [:before_each_foo_bar]
+          end
+        end
+
+        describe "group with matching metadata", :foo => :bar do
+          it "runs the hook" do
+            invoked_hooks.should == [:before_each_foo_bar]
+          end
+        end
+      end
       """
+    When I run `rspec filter_before_each_hooks_spec.rb`
+    Then the examples should all pass
 
   Scenario: filter `after(:each)` hooks using arbitrary metadata
     Given a file named "filter_after_each_hooks_spec.rb" with:
       """
       RSpec.configure do |config|
-        config.after(:each, :foo => :bar) { puts "In hook" }
+        config.after(:each, :foo => :bar) do
+          raise "boom!"
+        end
       end
 
-      describe "group 1" do
-        it("example 1") { }
-        it("example 2", :foo => :bar) { }
-      end
+      describe "a filtered after :each hook" do
+        describe "group without matching metadata" do
+          it "does not run the hook" do
+            # should pass
+          end
 
-      describe "group 2", :foo => :bar do
-        it("example 1") { }
-        it("example 2", :foo => :bar) { }
-      end
-      """
-    When I run "rspec filter_after_each_hooks_spec.rb --format documentation"
-    Then the output should contain:
-      """
-      group 1
-        example 1
-      In hook
-        example 2
+          it "runs the hook for an example with matching metadata", :foo => :bar do
+            # should fail
+          end
+        end
 
-      group 2
-      In hook
-        example 1
-      In hook
-        example 2
+        describe "group with matching metadata", :foo => :bar do
+          it "runs the hook" do
+            # should fail
+          end
+        end
+      end
       """
+    When I run `rspec filter_after_each_hooks_spec.rb`
+    Then the output should contain "3 examples, 2 failures"
 
   Scenario: filter around(:each) hooks using arbitrary metadata
     Given a file named "filter_around_each_hooks_spec.rb" with:
       """
       RSpec.configure do |config|
         config.around(:each, :foo => :bar) do |example|
-          puts "Start hook"
+          order << :before_around_each_foo_bar
           example.run
-          puts "End hook"
+          order.should == [:before_around_each_foo_bar, :example]
         end
       end
 
-      describe "group 1" do
-        it("example 1") { }
-        it("example 2", :foo => :bar) { }
-      end
+      describe "a filtered around(:each) hook" do
+        let(:order) { [] }
 
-      describe "group 2", :foo => :bar do
-        it("example 1") { }
-        it("example 2", :foo => :bar) { }
-      end
-      """
-    When I run "rspec filter_around_each_hooks_spec.rb --format documentation"
-    Then the output should contain:
-      """
-      group 1
-        example 1
-      Start hook
-      End hook
-        example 2
+        describe "a group without matching metadata" do
+          it "does not run the hook" do
+            order.should be_empty
+          end
 
-      group 2
-      Start hook
-      End hook
-        example 1
-      Start hook
-      End hook
-        example 2
+          it "runs the hook for an example with matching metadata", :foo => :bar do
+            order.should == [:before_around_each_foo_bar]
+            order << :example
+          end
+        end
+
+        describe "a group with matching metadata", :foo => :bar do
+          it "runs the hook for an example with matching metadata", :foo => :bar do
+            order.should == [:before_around_each_foo_bar]
+            order << :example
+          end
+        end
+      end
       """
+    When I run `rspec filter_around_each_hooks_spec.rb`
+    Then the examples should all pass
 
   Scenario: filter before(:all) hooks using arbitrary metadata
     Given a file named "filter_before_all_hooks_spec.rb" with:
       """
       RSpec.configure do |config|
-        config.before(:all, :foo => :bar) { puts "In hook" }
-      end
-
-      describe "group 1" do
-        it("example 1") { }
-        it("example 2") { }
+        config.before(:all, :foo => :bar) { @hook = :before_all_foo_bar }
       end
 
-      describe "group 2", :foo => :bar do
-        it("example 1") { }
-        it("example 2") { }
-      end
+      describe "a filtered before(:all) hook" do
+        describe "a group without matching metadata" do
+          it "does not run the hook" do
+            @hook.should be_nil
+          end
 
-      describe "group 3" do
-        describe "subgroup 1", :foo => :bar do
-          it("example 1") { }
+          describe "a nested subgroup with matching metadata", :foo => :bar do
+            it "runs the hook" do
+              @hook.should == :before_all_foo_bar
+            end
+          end
         end
-      end
-      """
-    When I run "rspec filter_before_all_hooks_spec.rb --format documentation"
-    Then the output should contain:
-      """
-      group 1
-        example 1
-        example 2
 
-      group 2
-      In hook
-        example 1
-        example 2
+        describe "a group with matching metadata", :foo => :bar do
+          it "runs the hook" do
+            @hook.should == :before_all_foo_bar
+          end
 
-      group 3
-        subgroup 1
-      In hook
-          example 1
+          describe "a nested subgroup" do
+            it "runs the hook" do
+              @hook.should == :before_all_foo_bar
+            end
+          end
+        end
+      end
       """
+    When I run `rspec filter_before_all_hooks_spec.rb`
+    Then the examples should all pass
 
   Scenario: filter after(:all) hooks using arbitrary metadata
     Given a file named "filter_after_all_hooks_spec.rb" with:
       """
+      example_msgs = []
+
       RSpec.configure do |config|
-        config.after(:all, :foo => :bar) { puts "In hook" }
+        config.after(:all, :foo => :bar) do
+          puts "after :all"
+        end
       end
 
-      describe "group 1" do
-        it("example 1") { }
-        it("example 2") { }
-      end
+      describe "a filtered after(:all) hook" do
+        describe "a group without matching metadata" do
+          it "does not run the hook" do
+            puts "unfiltered"
+          end
+        end
 
-      describe "group 2", :foo => :bar do
-        it("example 1") { }
-        it("example 2") { }
-      end
+        describe "a group with matching metadata", :foo => :bar do
+          it "runs the hook" do
+            puts "filtered 1"
+          end
+        end
 
-      describe "group 3" do
-        describe "subgroup 1", :foo => :bar do
-          it("example 1") { }
+        describe "another group without matching metadata" do
+          describe "a nested subgroup with matching metadata", :foo => :bar do
+            it "runs the hook" do
+              puts "filtered 2"
+            end
+          end
         end
       end
       """
-    When I run "rspec filter_after_all_hooks_spec.rb --format documentation"
-    Then the output should contain:
+    When I run `rspec filter_after_all_hooks_spec.rb`
+    Then the examples should all pass
+    And the output should contain:
+      """
+      unfiltered
+      .filtered 1
+      .after :all
+      filtered 2
+      .after :all
       """
-      group 1
-        example 1
-        example 2
 
-      group 2
-        example 1
-        example 2
-      In hook
+  Scenario: Use symbols as metadata
+    Given a file named "less_verbose_metadata_filter.rb" with:
+      """
+      RSpec.configure do |c|
+        c.treat_symbols_as_metadata_keys_with_true_values = true
+        c.before(:each, :before_each) { puts "before each" }
+        c.after(:each,  :after_each) { puts "after each" }
+        c.around(:each, :around_each) do |example|
+          puts "around each (before)"
+          example.run
+          puts "around each (after)"
+        end
+        c.before(:all, :before_all) { puts "before all" }
+        c.after(:all,  :after_all) { puts "after all" }
+      end
 
-      group 3
-        subgroup 1
-          example 1
-      In hook
+      describe "group 1", :before_all, :after_all do
+        it("") { puts "example 1" }
+        it("", :before_each) { puts "example 2" }
+        it("", :after_each) { puts "example 3" }
+        it("", :around_each) { puts "example 4" }
+      end
       """
+    When I run `rspec less_verbose_metadata_filter.rb`
+    Then the examples should all pass
+    And the output should contain:
+      """
+      before all
+      example 1
+      .before each
+      example 2
+      .example 3
+      after each
+      .around each (before)
+      example 4
+      around each (after)
+      .after all
+      """
+