rspec-core 2.0.0.a2 → 2.0.0.a3

data/spec/spec_helper.rb

@@ -1,14 +1,11 @@
-dir = File.dirname(__FILE__)
-lib_path = File.expand_path("#{dir}/../lib")
-$LOAD_PATH.unshift lib_path unless $LOAD_PATH.include?(lib_path)
+$LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
+require 'rspec/core'
 
 require 'rubygems'
-$LOAD_PATH.unshift(File.expand_path('../../../expectations/lib'), __FILE__)
+$LOAD_PATH << File.expand_path('../../../expectations/lib', __FILE__)
+$LOAD_PATH << File.expand_path('../../../mocks/lib', __FILE__)
 require 'rspec/expectations'
-$LOAD_PATH.unshift(File.expand_path('../../../mocks/lib'), __FILE__)
 require 'rspec/mocks'
-$LOAD_PATH.unshift(File.expand_path('../../lib'), __FILE__)
-require 'rspec/core'
 
 Rspec::Core::ExampleGroup.send(:include, Rspec::Matchers)
 
@@ -16,10 +13,6 @@ def with_ruby(version)
   yield if RUBY_PLATFORM =~ Regexp.compile("^#{version}")
 end
 
-require 'rubygems'
-
-require File.expand_path(File.dirname(__FILE__) + "/resources/example_classes")
-
 module Rspec
   module Core
     module Matchers
@@ -34,27 +27,24 @@ module Rspec
   end
 end
 
-def remove_last_describe_from_world
-  Rspec::Core.world.behaviours.pop
+def remove_last_example_group_from_world
+  Rspec::Core.world.example_groups.pop
 end
 
-def isolate_example_group
-  if block_given?
-    example_groups = Rspec::Core.world.behaviours.dup
-    begin
-      Rspec::Core.world.behaviours.clear
-      yield
-    ensure
-      Rspec::Core.world.behaviours.clear
-      Rspec::Core.world.behaviours.concat(example_groups)
-    end
-  end
+def disconnect_from_world
+  example_groups = Rspec::Core.world.example_groups.dup
+  Rspec::Core.world.example_groups.clear
+  yield
+ensure
+  Rspec::Core.world.example_groups.clear
+  Rspec::Core.world.example_groups.concat(example_groups)
 end
 
-def double_describe(*args)
-  group = Rspec::Core::ExampleGroup.describe(*args) {}
-  remove_last_describe_from_world
-  yield group if block_given?
+def isolated_example_group(*args, &block)
+  block ||= lambda {}
+  args << 'example group' if args.empty?
+  group = Rspec::Core::ExampleGroup.describe(*args, &block)
+  remove_last_example_group_from_world
   group
 end
 
@@ -72,8 +62,7 @@ end
 
 Rspec::Core.configure do |c|
   c.mock_framework = :rspec
-  # c.filter_run :focused => true
-  # TODO: Filter run needs normal before/after/include filter logic
   c.filter_run :focused => true
+  c.run_all_when_everything_filtered = true
   c.color_enabled = not_in_editor?
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-core
 version: !ruby/object:Gem::Version 
-  version: 2.0.0.a2
+  version: 2.0.0.a3
 platform: ruby
 authors: 
 - David Chelimsky
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-24 00:00:00 -06:00
+date: 2010-02-03 00:00:00 -06:00
 default_executable: rspec
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,7 +21,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.0.a2
+        version: 2.0.0.a3
     version: 
 - !ruby/object:Gem::Dependency 
   name: rspec-mocks
@@ -31,7 +31,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.0.a2
+        version: 2.0.0.a3
     version: 
 - !ruby/object:Gem::Dependency 
   name: cucumber
@@ -43,7 +43,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.5.3
     version: 
-description: 
+description: Rspec runner and example group classes
 email: dchelimsky@gmail.com;chad.humphries@gmail.com
 executables: 
 - rspec
@@ -108,8 +108,6 @@ files:
 - example_specs/passing/stubbing_example.rb
 - example_specs/passing/yielding_example.rb
 - example_specs/ruby1.9.compatibility/access_to_constants_spec.rb
-- features-pending/command_line/line_number_option.feature
-- features-pending/command_line/line_number_option_with_example_with_no_name.feature
 - features-pending/example_groups/example_group_with_should_methods.feature
 - features-pending/example_groups/implicit_docstrings.feature
 - features-pending/expectations/expect_change.feature
@@ -128,6 +126,9 @@ files:
 - features-pending/runner/specify_line_number.feature
 - features/before_and_after_blocks/around.feature
 - features/before_and_after_blocks/before_and_after_blocks.feature
+- features/command_line/example_name_option.feature
+- features/command_line/line_number_appended_to_path.feature
+- features/command_line/line_number_option.feature
 - features/example_groups/describe_aliases.feature
 - features/example_groups/nested_groups.feature
 - features/expectations/customized_message.feature
@@ -154,7 +155,6 @@ files:
 - lib/rspec/core/example.rb
 - lib/rspec/core/example_group.rb
 - lib/rspec/core/example_group_subject.rb
-- lib/rspec/core/extensions/instance_exec.rb
 - lib/rspec/core/formatters.rb
 - lib/rspec/core/formatters/base_formatter.rb
 - lib/rspec/core/formatters/base_text_formatter.rb
@@ -171,13 +171,12 @@ files:
 - lib/rspec/core/rake_task.rb
 - lib/rspec/core/ruby_project.rb
 - lib/rspec/core/runner.rb
-- lib/rspec/core/shared_behaviour.rb
-- lib/rspec/core/shared_behaviour_kernel_extensions.rb
+- lib/rspec/core/shared_example_group.rb
+- lib/rspec/core/shared_example_group_kernel_extensions.rb
 - lib/rspec/core/version.rb
 - lib/rspec/core/world.rb
 - rspec-core.gemspec
 - script/console
-- spec/resources/example_classes.rb
 - spec/rspec/core/command_line_options_spec.rb
 - spec/rspec/core/configuration_spec.rb
 - spec/rspec/core/example_group_spec.rb
@@ -189,14 +188,15 @@ files:
 - spec/rspec/core/kernel_extensions_spec.rb
 - spec/rspec/core/metadata_spec.rb
 - spec/rspec/core/mocha_spec.rb
+- spec/rspec/core/pending_example_spec.rb
 - spec/rspec/core/resources/a_bar.rb
 - spec/rspec/core/resources/a_foo.rb
 - spec/rspec/core/resources/a_spec.rb
 - spec/rspec/core/resources/custom_example_group_runner.rb
-- spec/rspec/core/resources/example_classes.rb
 - spec/rspec/core/resources/utf8_encoded.rb
+- spec/rspec/core/ruby_project_spec.rb
 - spec/rspec/core/runner_spec.rb
-- spec/rspec/core/shared_behaviour_spec.rb
+- spec/rspec/core/shared_example_group_spec.rb
 - spec/rspec/core/world_spec.rb
 - spec/rspec/core_spec.rb
 - spec/ruby_forker.rb
@@ -229,9 +229,8 @@ rubyforge_project: rspec
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: Rspec runner and example group classes
+summary: rspec-core 2.0.0.a3
 test_files: 
-- spec/resources/example_classes.rb
 - spec/rspec/core/command_line_options_spec.rb
 - spec/rspec/core/configuration_spec.rb
 - spec/rspec/core/example_group_spec.rb
@@ -243,14 +242,15 @@ test_files:
 - spec/rspec/core/kernel_extensions_spec.rb
 - spec/rspec/core/metadata_spec.rb
 - spec/rspec/core/mocha_spec.rb
+- spec/rspec/core/pending_example_spec.rb
 - spec/rspec/core/resources/a_bar.rb
 - spec/rspec/core/resources/a_foo.rb
 - spec/rspec/core/resources/a_spec.rb
 - spec/rspec/core/resources/custom_example_group_runner.rb
-- spec/rspec/core/resources/example_classes.rb
 - spec/rspec/core/resources/utf8_encoded.rb
+- spec/rspec/core/ruby_project_spec.rb
 - spec/rspec/core/runner_spec.rb
-- spec/rspec/core/shared_behaviour_spec.rb
+- spec/rspec/core/shared_example_group_spec.rb
 - spec/rspec/core/world_spec.rb
 - spec/rspec/core_spec.rb
 - spec/ruby_forker.rb

data/features-pending/command_line/line_number_option.feature

@@ -1,56 +0,0 @@
-Feature: Spec and test together
-
-  As an RSpec user
-  I want to run one example identified by the line number
-  
-  Background:
-    Given a file named "example.rb" with:
-      """
-      describe "a group" do
-
-        it "has a first example" do
-
-        end
-        
-        it "has a second example" do
-
-        end
-        
-      end
-      """
-
-  Scenario: two examples - first example on declaration line
-    When I run "spec example.rb:3 --format nested"
-    Then the stdout should match "1 example, 0 failures"
-    And the stdout should match "has a first example"
-    But the stdout should not match "has a second example"
-
-  Scenario: two examples - first example from line inside declaration
-    When I run "spec example.rb:4 --format nested"
-    Then the stdout should match "1 example, 0 failures"
-    And the stdout should match "has a first example"
-    But the stdout should not match "has a second example"
-
-  Scenario: two examples - first example from line below declaration
-    When I run "spec example.rb:6 --format nested"
-    Then the stdout should match "1 example, 0 failures"
-    And the stdout should match "has a first example"
-    But the stdout should not match "has a second example"
-
-  Scenario: two examples - second example from line below declaration
-    When I run "spec example.rb:7 --format nested"
-    Then the stdout should match "1 example, 0 failures"
-    And the stdout should match "has a second example"
-    But the stdout should not match "has a first example"
-
-  Scenario: two examples - both examples from the group declaration
-    When I run "spec example.rb:1 --format nested"
-    Then the stdout should match "2 examples, 0 failures"
-    And the stdout should match "has a second example"
-    And the stdout should match "has a first example"
-
-  Scenario: two examples - both examples from above the first example declaration
-    When I run "spec example.rb:2 --format nested"
-    Then the stdout should match "2 examples, 0 failures"
-    And the stdout should match "has a second example"
-    And the stdout should match "has a first example"

data/features-pending/command_line/line_number_option_with_example_with_no_name.feature

@@ -1,22 +0,0 @@
-Feature: Spec and test together
-
-  As an RSpec user
-  I want to run one example identified by the line number
-  
-  Background:
-    Given a file named "example.rb" with:
-      """
-      describe 9 do
-
-        it { should be > 8 }
-
-        it { should be < 10 }
-        
-      end
-      """
-
-  Scenario: two examples - first example on declaration line
-    When I run "spec example.rb:3 --format nested"
-    Then the stdout should match "1 example, 0 failures"
-    Then the stdout should match "should be > 8"
-    But the stdout should not match "should be < 10"

data/lib/rspec/core/extensions/instance_exec.rb

@@ -1,31 +0,0 @@
-module Rspec
-  module Core
-    module InstanceExec
-      unless respond_to?(:instance_exec)
-        # based on Bounded Spec InstanceExec (Mauricio Fernandez)
-        # http://eigenclass.org/hiki/bounded+space+instance_exec
-        # - uses singleton_class of matcher instead of global
-        #   InstanceExecHelper module
-        # - this keeps it scoped to this class only, which is the
-        #   only place we need it
-        # - only necessary for ruby 1.8.6
-        def instance_exec(*args, &block)
-          singleton_class = (class << self; self; end)
-          begin
-            orig_critical, Thread.critical = Thread.critical, true
-            n = 0
-            n += 1 while respond_to?(method_name="__instance_exec#{n}")
-            singleton_class.module_eval{ define_method(:__instance_exec, &block) }
-          ensure
-            Thread.critical = orig_critical
-          end
-          begin
-            return send(:__instance_exec, *args)
-          ensure
-            singleton_class.module_eval{ remove_method(:__instance_exec) } rescue nil
-          end
-        end
-      end
-    end
-  end
-end

data/spec/resources/example_classes.rb

@@ -1,67 +0,0 @@
-# This file contains various classes used by the specs.
-module Rspec::Core
-  module Expectations
-    class Person
-      attr_reader :name
-      def initialize name
-        @name = name
-      end
-      def == other
-        return @name == other.name
-      end
-    end
-    
-    class ClassWithMultiWordPredicate
-      def multi_word_predicate?
-        true 
-      end
-    end
-
-    module Helper
-      class CollectionWithSizeMethod
-        def initialize; @list = []; end
-        def size; @list.size; end
-        def push(item); @list.push(item); end
-      end
-
-      class CollectionWithLengthMethod
-        def initialize; @list = []; end
-        def length; @list.size; end
-        def push(item); @list.push(item); end
-      end
-
-      class CollectionOwner
-        attr_reader :items_in_collection_with_size_method, :items_in_collection_with_length_method
-
-        def initialize
-          @items_in_collection_with_size_method = CollectionWithSizeMethod.new
-          @items_in_collection_with_length_method = CollectionWithLengthMethod.new
-        end
-
-        def add_to_collection_with_size_method(item)
-          @items_in_collection_with_size_method.push(item)
-        end
-
-        def add_to_collection_with_length_method(item)
-          @items_in_collection_with_length_method.push(item)
-        end
-        
-        def items_for(arg)
-          return [1, 2, 3] if arg == 'a'
-          [1]
-        end
-        
-        def items
-          @items_in_collection_with_size_method
-        end
-      end
-
-      class ClassWithUnqueriedPredicate
-        attr_accessor :foo
-        def initialize(foo)
-          @foo = foo
-        end
-      end
-    end
-  end
-end

data/spec/rspec/core/resources/example_classes.rb

@@ -1,67 +0,0 @@
-# This file contains various classes used by the specs.
-module Rspec::Core
-  module Expectations
-    class Person
-      attr_reader :name
-      def initialize name
-        @name = name
-      end
-      def == other
-        return @name == other.name
-      end
-    end
-    
-    class ClassWithMultiWordPredicate
-      def multi_word_predicate?
-        true 
-      end
-    end
-
-    module Helper
-      class CollectionWithSizeMethod
-        def initialize; @list = []; end
-        def size; @list.size; end
-        def push(item); @list.push(item); end
-      end
-
-      class CollectionWithLengthMethod
-        def initialize; @list = []; end
-        def length; @list.size; end
-        def push(item); @list.push(item); end
-      end
-
-      class CollectionOwner
-        attr_reader :items_in_collection_with_size_method, :items_in_collection_with_length_method
-
-        def initialize
-          @items_in_collection_with_size_method = CollectionWithSizeMethod.new
-          @items_in_collection_with_length_method = CollectionWithLengthMethod.new
-        end
-
-        def add_to_collection_with_size_method(item)
-          @items_in_collection_with_size_method.push(item)
-        end
-
-        def add_to_collection_with_length_method(item)
-          @items_in_collection_with_length_method.push(item)
-        end
-        
-        def items_for(arg)
-          return [1, 2, 3] if arg == 'a'
-          [1]
-        end
-        
-        def items
-          @items_in_collection_with_size_method
-        end
-      end
-
-      class ClassWithUnqueriedPredicate
-        attr_accessor :foo
-        def initialize(foo)
-          @foo = foo
-        end
-      end
-    end
-  end
-end