rspec-core 2.0.0.beta.6 → 2.0.0.beta.7

data/VERSION

@@ -1 +1 @@
-2.0.0.beta.6
+2.0.0.beta.7

data/features/command_line/line_number_appended_to_path.feature

@@ -37,9 +37,23 @@ Feature: line number appended to file path
     And I should see "example in nested group"
 
 @wip
+  Scenario: nested groups - outer group inside block before example
+    When I run "rspec example_spec.rb:2 --format doc"
+    Then I should see "3 examples, 0 failures"
+    And I should see "second example in outer group"
+    And I should see "first example in outer group"
+    And I should see "example in nested group"
+
   Scenario: nested groups - inner group on declaration line
     When I run "rspec example_spec.rb:11 --format doc"
-    Then I should see "3 examples, 0 failures"
+    Then I should see "1 example, 0 failures"
+    And I should see "example in nested group"
+    And I should not see "second example in outer group"
+    And I should not see "first example in outer group"
+
+  Scenario: nested groups - inner group inside block before example
+    When I run "rspec example_spec.rb:12 --format doc"
+    Then I should see "1 example, 0 failures"
     And I should see "example in nested group"
     And I should not see "second example in outer group"
     And I should not see "first example in outer group"
@@ -51,9 +65,46 @@ Feature: line number appended to file path
     But I should not see "second example in outer group"
     And I should not see "example in nested group"
 
+  Scenario: two examples - first example inside block
+    When I run "rspec example_spec.rb:4 --format doc"
+    Then I should see "1 example, 0 failures"
+    And I should see "first example in outer group"
+    But I should not see "second example in outer group"
+    And I should not see "example in nested group"
+
+  Scenario: two examples - first example on end
+    When I run "rspec example_spec.rb:5 --format doc"
+    Then I should see "1 example, 0 failures"
+    And I should see "first example in outer group"
+    But I should not see "second example in outer group"
+    And I should not see "example in nested group"
+
+  Scenario: two examples - first example after end but before next example
+    When I run "rspec example_spec.rb:6 --format doc"
+    Then I should see "1 example, 0 failures"
+    And I should see "first example in outer group"
+    But I should not see "second example in outer group"
+    And I should not see "example in nested group"
+
   Scenario: two examples - second example on declaration line
     When I run "rspec example_spec.rb:7 --format doc"
     Then I should see "1 example, 0 failures"
     And I should see "second example in outer group"
     But I should not see "first example in outer group"
     And I should not see "example in nested group"
+
+  Scenario: two examples - second example inside block
+    When I run "rspec example_spec.rb:7 --format doc"
+    Then I should see "1 example, 0 failures"
+    And I should see "second example in outer group"
+    But I should not see "first example in outer group"
+    And I should not see "example in nested group"
+
+  Scenario: two examples - second example on end
+    When I run "rspec example_spec.rb:7 --format doc"
+    Then I should see "1 example, 0 failures"
+    And I should see "second example in outer group"
+    But I should not see "first example in outer group"
+    And I should not see "example in nested group"
+
+

data/lib/rspec/core/configuration_options.rb

@@ -30,7 +30,7 @@ module Rspec
     private
 
       def merged_options
-        [global_options, local_options, command_line_options].inject({}) do |merged, options|
+        [global_options, local_options, command_line_options].inject do |merged, options|
           merged.merge(options)
         end
       end

data/lib/rspec/core/example_group.rb

@@ -17,22 +17,21 @@ module Rspec
         ancestors.select { |mod| mod.class == Module } - [ Object, Kernel ]
       end
 
-      def self.example(desc=nil, options={}, &block)
-        options.update(:pending => true) unless block
-        options.update(:caller => caller)
-        examples << Rspec::Core::Example.new(self, desc, options, block)
+      def self.define_example_method(name, extra_options={})
+        module_eval(<<-END_RUBY, __FILE__, __LINE__)
+          def self.#{name}(desc=nil, options={}, &block)
+            options.update(:pending => true) unless block
+            options.update(:caller => caller)
+            options.update(#{extra_options.inspect})
+            examples << Rspec::Core::Example.new(self, desc, options, block)
+          end
+        END_RUBY
       end
 
-      def self.alias_example_to(new_alias, extra_options={})
-        new_alias = <<-END_RUBY
-                      def self.#{new_alias}(desc=nil, options={}, &block)
-                        options.update(:pending => true) unless block
-                        options.update(:caller => caller)
-                        options.update(#{extra_options.inspect})
-                        examples << Rspec::Core::Example.new(self, desc, options, block)
-                      end
-                    END_RUBY
-        module_eval(new_alias, __FILE__, __LINE__)
+      define_example_method :example
+
+      class << self
+        alias_method :alias_example_to, :define_example_method
       end
 
       alias_example_to :it
@@ -128,14 +127,13 @@ module Rspec
       end
 
       def self.ancestors(superclass_last=false)
-        classes = []
         current_class = self
 
+        classes = []
         while current_class < Rspec::Core::ExampleGroup
           superclass_last ? classes << current_class : classes.unshift(current_class)
           current_class = current_class.superclass
         end
-
         classes
       end
 
@@ -188,12 +186,12 @@ module Rspec
       end
 
       # Runs all examples, returning true only if all of them pass
-      def self.run_examples(example_world, reporter)
-        examples_to_run.map do |ex| 
-          result = ex.run(example_world, reporter) 
-          example_world.__reset__
-          before_all_ivars.each { |k, v| example_world.instance_variable_set(k, v) } 
-          result
+      def self.run_examples(instance, reporter)
+        examples_to_run.map do |example|
+          success = example.run(instance, reporter)
+          instance.__reset__
+          before_all_ivars.each {|k, v| instance.instance_variable_set(k, v)}
+          success
         end.all?
       end
 
@@ -205,6 +203,11 @@ module Rspec
         metadata.all_apply?(filters)
       end
 
+      def self.declaration_line_numbers
+        [metadata[:example_group][:line_number]] +
+          examples.collect {|e| e.metadata[:line_number]}
+      end
+
       def described_class
         self.class.describes
       end

data/lib/rspec/core/formatters/base_formatter.rb

@@ -18,11 +18,11 @@ module Rspec
         end
 
         def pending_examples
-          @pending_examples ||= ::Rspec::Core.world.find(examples, :positive, :execution_result => { :status => 'pending' })
+          @pending_examples ||= ::Rspec::Core.world.find(examples, :execution_result => { :status => 'pending' })
         end
 
         def failed_examples
-          @failed_examples ||= ::Rspec::Core.world.find(examples, :positive, :execution_result => { :status => 'failed' })
+          @failed_examples ||= ::Rspec::Core.world.find(examples, :execution_result => { :status => 'failed' })
         end
 
         def report(count)

data/lib/rspec/core/let.rb

@@ -9,6 +9,11 @@ module Rspec
             __memoized[name] ||= instance_eval(&block)
           end
         end
+
+        def let!(name, &block)
+          let(name, &block)
+          before { __send__(name) } 
+        end
       end
 
       module InstanceMethods

data/lib/rspec/core/metadata.rb

@@ -94,7 +94,8 @@ EOM
           filter.call(metadata[filter_on]) rescue false
         when Fixnum
           if filter_on == :line_number
-            [metadata[:line_number],metadata[:example_group][:line_number]].include?(filter)
+            [metadata[:line_number], metadata[:example_group][:line_number]].
+              include?(world.preceding_example_or_group_line(filter))
           else
             metadata[filter_on] == filter
           end
@@ -105,6 +106,10 @@ EOM
 
     private
 
+      def world
+        Rspec::Core.world
+      end
+
       def superclass_metadata
         @superclass_metadata ||= { :example_group => {} }
       end

data/lib/rspec/core/world.rb

@@ -8,7 +8,7 @@ module Rspec
         @example_groups = []
       end
 
-      def filter
+      def inclusion_filter
         Rspec.configuration.filter
       end
 
@@ -21,66 +21,68 @@ module Rspec
       end
 
       def example_groups_to_run
-        return @example_groups_to_run if @example_groups_to_run
-
-        if filter || exclusion_filter
-          @example_groups_to_run = filter_example_groups
-
-          if @example_groups_to_run.size == 0 && Rspec.configuration.run_all_when_everything_filtered?
-            Rspec.configuration.puts "No examples were matched by #{filter.inspect}, running all"
-            # reset the behaviour list to all example groups, and add back all examples
-            @example_groups_to_run = @example_groups
-            @example_groups.each { |b| b.examples_to_run.replace(b.examples) }
+        @example_groups_to_run ||= begin
+          if inclusion_filter || exclusion_filter
+            if Rspec.configuration.run_all_when_everything_filtered? && filtered_example_groups.empty?
+              Rspec.configuration.puts "No examples were matched by #{inclusion_filter.inspect}, running all"
+              all_example_groups
+            else
+              Rspec.configuration.puts "Run filtered using #{inclusion_filter.inspect}"          
+              filtered_example_groups
+            end
           else
-            Rspec.configuration.puts "Run filtered using #{filter.inspect}"          
-          end
-        else
-          @example_groups_to_run = @example_groups
-          @example_groups.each { |b| b.examples_to_run.replace(b.examples) }
-        end      
+            all_example_groups
+          end      
+        end
+      end
 
-        @example_groups_to_run
+      def all_example_groups
+        @example_groups.each { |g| g.examples_to_run.replace(g.examples) }
       end
 
       def total_examples_to_run
-        @total_examples_to_run ||= example_groups_to_run.inject(0) { |sum, b| sum += b.examples_to_run.size }
+        @total_examples_to_run ||= example_groups_to_run.inject(0) { |sum, g| sum += g.examples_to_run.size }
       end
 
-      def filter_example_groups
-        example_groups.inject([]) do |list_of_example_groups, example_group|
+      def filtered_example_groups
+        @filtered_example_groups ||= example_groups.select do |example_group|
           examples = example_group.examples
           examples = apply_exclusion_filters(examples, exclusion_filter) if exclusion_filter
-          examples = apply_inclusion_filters(examples, filter) if filter
+          examples = apply_inclusion_filters(examples, inclusion_filter) if inclusion_filter
           examples.uniq!
           example_group.examples_to_run.replace(examples)
-          if examples.empty?
-            list_of_example_groups << nil
-          else
-            list_of_example_groups << example_group
-          end
-        end.compact
+          !examples.empty?
+        end
       end
 
-      def apply_inclusion_filters(collection, conditions={})
-        find(collection, :positive, conditions)
+      def apply_inclusion_filters(examples, conditions={})
+        examples.select &all_apply?(conditions)
       end
 
-      def apply_exclusion_filters(collection, conditions={})
-        find(collection, :negative, conditions)
-      end
+      alias_method :find, :apply_inclusion_filters
 
-      def find(collection, type_of_filter=:positive, conditions={})
-        negative = type_of_filter != :positive
+      def apply_exclusion_filters(examples, conditions={})
+        examples.reject &all_apply?(conditions)
+      end
 
-        collection.select do |item|
-          # negative conditions.any?, positive conditions.all? ?????
-          result = conditions.all? do |filter_on, filter| 
-            item.metadata.apply_condition(filter_on, filter)
-          end
-          negative ? !result : result
+      def preceding_example_or_group_line(filter_line) 
+        declaration_line_numbers.inject(nil) do |highest_prior_declaration_line, line|
+          line <= filter_line ? line : highest_prior_declaration_line
         end
       end
+      
+    private
+
+      def all_apply?(conditions)
+        lambda {|example| example.metadata.all_apply?(conditions)}
+      end
 
+      def declaration_line_numbers
+        @line_numbers ||= example_groups.inject([]) do |lines, g|
+          lines + g.declaration_line_numbers
+        end
+      end
+      
     end
   end
 end

data/rspec-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-core}
-  s.version = "2.0.0.beta.6"
+  s.version = "2.0.0.beta.7"
 
   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-04-12}
+  s.date = %q{2010-04-17}
   s.description = %q{Rspec runner and example group classes}
   s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
   s.executables = ["rspec", "spec"]
@@ -166,7 +166,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/rspec/core}
   s.post_install_message = %q{**************************************************
 
-  Thank you for installing rspec-core-2.0.0.beta.6
+  Thank you for installing rspec-core-2.0.0.beta.7
 
   This is beta software. If you are looking
   for a supported production release, please
@@ -178,7 +178,7 @@ 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.6}
+  s.summary = %q{rspec-core-2.0.0.beta.7}
   s.test_files = [
     "spec/autotest/failed_results_re_spec.rb",
      "spec/autotest/rspec_spec.rb",
@@ -216,19 +216,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.6"])
-      s.add_development_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.6"])
+      s.add_development_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.7"])
+      s.add_development_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.7"])
       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.6"])
-      s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.6"])
+      s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.7"])
+      s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.7"])
       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.6"])
-    s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.6"])
+    s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.7"])
+    s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.7"])
     s.add_dependency(%q<cucumber>, [">= 0.5.3"])
     s.add_dependency(%q<autotest>, [">= 4.2.9"])
   end

data/spec/rspec/core/example_group_spec.rb

@@ -339,6 +339,25 @@ module Rspec::Core
       end
     end
 
+    describe "#let!" do
+      let!(:creator) do
+        class Creator
+          @count = 0
+          def self.count
+            @count += 1
+          end
+        end
+      end
+
+      it "evaluates the value non-lazily" do
+        lambda { Creator.count }.should_not raise_error
+      end
+
+      it "does not interfere between tests" do 
+        Creator.count.should == 1
+      end
+    end
+
     describe "#around" do
 
       around(:each) do |example|

data/spec/rspec/core/metadata_spec.rb

@@ -99,7 +99,7 @@ module Rspec
       end
 
       describe "line number" do
-        it "finds the line number with the first spec file " do
+        it "finds the line number with the first spec file in the backtrace" do
           m = Metadata.new
           m.process(:caller => [
             "foo",
@@ -158,6 +158,13 @@ module Rspec
         it "merges arbitrary options" do
           mfe[:arbitrary].should == :options 
         end
+
+        it "points :example_group to the same hash object" do
+          a = metadata.for_example("foo", {})[:example_group]
+          b = metadata.for_example("bar", {})[:example_group]
+          a[:description] = "new description"
+          b[:description].should == "new description"
+        end
       end
 
       describe "apply_condition" do
@@ -165,14 +172,37 @@ module Rspec
         let(:group_line_number) { __LINE__ -1 }
         let(:example_metadata) { group_metadata.for_example('example', :caller => ["foo_spec.rb:#{__LINE__}"]) }
         let(:example_line_number) { __LINE__ -1 }
-
-        it "matches when the line_number matches the group" do
+        let(:next_example_metadata) {group_metadata.for_example('next_example', 
+          :caller => ["foo_spec.rb:#{example_line_number + 2}"])}
+        let(:world) { Rspec::Core.world }
+
+        it "matches the group when the line_number is the example group line number" do
+          world.should_receive(:preceding_example_or_group_line).and_return(group_line_number)
+          # this call doesn't really make sense since apply_condition is only called 
+          # for example metadata not group metadata
           group_metadata.apply_condition(:line_number, group_line_number).should be_true
         end
 
-        it "matches when the line_number matches the example" do
+        it "matches the example when the line_number is the parent example group line number" do
+          world.should_receive(:preceding_example_or_group_line).and_return(group_line_number)
+          example_metadata.apply_condition(:line_number, group_line_number).should be_true
+        end
+
+        it "matches the example when the line_number is the example line number" do
+          world.should_receive(:preceding_example_or_group_line).and_return(example_line_number)
           example_metadata.apply_condition(:line_number, example_line_number).should be_true
         end
+        
+        it "matches when the line number is between this example and the next" do
+          world.should_receive(:preceding_example_or_group_line).and_return(example_line_number)
+          example_metadata.apply_condition(:line_number, example_line_number + 1).should be_true
+        end
+        
+        it "does not match when the line number matches the next example" do
+          world.should_receive(:preceding_example_or_group_line).and_return(example_line_number + 2)
+          example_metadata.apply_condition(:line_number, example_line_number + 2).should be_false
+        end
+        
       end
 
     end

data/spec/rspec/core/world_spec.rb

@@ -131,13 +131,52 @@ module Rspec::Core
         Rspec::Core.world.stub(:exclusion_filter).and_return({ :awesome => false })
         Rspec::Core.world.stub(:filter).and_return({ :color => :red })
         Rspec::Core.world.stub(:example_groups).and_return([@group1])
-        filtered_example_groups = @world.filter_example_groups
+        filtered_example_groups = @world.filtered_example_groups
         filtered_example_groups.should == [@group1]
         @group1.examples_to_run.should == @group1.examples[0..1]      
       end
       
     end
 
+    describe "preceding_example_or_group_line" do
+      before(:each) do
+        @group1_line = 10
+        @group2_line = 20
+        @group2_example1_line = 30
+        @group2_example2_line = 40
+        
+        @group1 = Rspec::Core::ExampleGroup.describe(Bar, "group-1") { }
+        @group2 = Rspec::Core::ExampleGroup.describe(Bar, "group-2") do
+          it('example 1') {}
+          it("example 2") {}
+        end
+        @group1.metadata[:example_group][:line_number] = @group1_line
+        @group2.metadata[:example_group][:line_number] = @group2_line
+        @group2.examples[0].metadata[:line_number] = @group2_example1_line
+        @group2.examples[1].metadata[:line_number] = @group2_example2_line
+      end
+      
+      it "should return nil if no example or group precedes the line" do 
+        @world.preceding_example_or_group_line(@group1_line-1).should == nil
+      end
+      
+      it "should return the argument line number if a group starts on that line" do
+        @world.preceding_example_or_group_line(@group1_line).should == @group1_line
+      end
+      
+      it "should return the argument line number if an example starts on that line" do
+        @world.preceding_example_or_group_line(@group2_example1_line).should == @group2_example1_line
+      end
+      
+      it "should return line number of a group that immediately precedes the argument line" do
+        @world.preceding_example_or_group_line(@group2_line+1).should == @group2_line
+      end
+      
+      it "should return line number of an example that immediately precedes the argument line" do
+        @world.preceding_example_or_group_line(@group2_example1_line+1).should == @group2_example1_line        
+      end
+      
+    end
   end
 
 end

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - beta
-  - 6
-  version: 2.0.0.beta.6
+  - 7
+  version: 2.0.0.beta.7
 platform: ruby
 authors: 
 - Chad Humphries
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-12 00:00:00 -05:00
+date: 2010-04-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,8 +32,8 @@ dependencies:
         - 0
         - 0
         - beta
-        - 6
-        version: 2.0.0.beta.6
+        - 7
+        version: 2.0.0.beta.7
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -48,8 +48,8 @@ dependencies:
         - 0
         - 0
         - beta
-        - 6
-        version: 2.0.0.beta.6
+        - 7
+        version: 2.0.0.beta.7
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -242,7 +242,7 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing rspec-core-2.0.0.beta.6
+    Thank you for installing rspec-core-2.0.0.beta.7
   
     This is beta software. If you are looking
     for a supported production release, please
@@ -276,7 +276,7 @@ rubyforge_project: rspec
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: rspec-core-2.0.0.beta.6
+summary: rspec-core-2.0.0.beta.7
 test_files: 
 - spec/autotest/failed_results_re_spec.rb
 - spec/autotest/rspec_spec.rb