dchelimsky-rspec 1.1.12 → 1.1.99.1

data/features/mock_framework_integration/use_flexmock.feature

@@ -1,9 +1,27 @@
-Story: Getting correct output with flexmock
+Feature: mock with flexmock
 
   As an RSpec user who prefers flexmock
   I want to be able to use flexmock without rspec mocks interfering
 
   Scenario: Mock with flexmock
-    Given the file ../../resources/spec/spec_with_flexmock.rb
-    When I run it with the ruby interpreter
-    Then the exit code should be 0
+    Given the following spec:
+      """
+      Spec::Runner.configure do |config|
+        config.mock_with :flexmock
+      end
+
+      describe "plugging in flexmock" do
+        it "allows flexmock to be used" do
+          target = Object.new
+          flexmock(target).should_receive(:foo).once
+          target.foo
+        end
+
+        it "does not include rspec mocks" do
+          Spec.const_defined?(:Mocks).should be_false
+        end
+      end
+      """
+    When I run it with the spec command
+    Then the exit code should be 0
+    And the stdout should match "2 examples, 0 failures"

data/features/mock_framework_integration/use_mocha.feature

@@ -0,0 +1,27 @@
+Feature: mock with mocha
+
+  As an RSpec user who prefers mocha
+  I want to be able to use mocha without rspec mocks interfering
+
+  Scenario: Mock with mocha
+    Given the following spec:
+      """
+      Spec::Runner.configure do |config|
+        config.mock_with :mocha
+      end
+
+      describe "plugging in mocha" do
+        it "allows mocha to be used" do
+          target = Object.new
+          target.expects(:foo).once
+          target.foo
+        end
+
+        it "does not include rspec mocks" do
+          Spec.const_defined?(:Mocks).should be_false
+        end
+      end
+      """
+    When I run it with the spec command
+    Then the exit code should be 0
+    And the stdout should match "2 examples, 0 failures"

data/features/mock_framework_integration/use_rr.feature

@@ -0,0 +1,27 @@
+Feature: mock with rr
+
+  As an RSpec user who prefers rr
+  I want to be able to use rr without rspec mocks interfering
+
+  Scenario: Mock with rr
+    Given the following spec:
+      """
+      Spec::Runner.configure do |config|
+        config.mock_with :rr
+      end
+
+      describe "plugging in rr" do
+        it "allows rr to be used" do
+          target = Object.new
+          mock(target).foo
+          target.foo
+        end
+
+        it "does not include rspec mocks" do
+          Spec.const_defined?(:Mocks).should be_false
+        end
+      end
+      """
+    When I run it with the spec command
+    Then the exit code should be 0
+    And the stdout should match "2 examples, 0 failures"

data/features/step_definitions/running_rspec.rb

@@ -6,7 +6,9 @@ Given /^the file (.*)$/ do |relative_path|
 end
 
 Given /^the following spec:$/ do |spec|
-  @path = "/tmp/example_spec.rb"
+  dir = File.join(File.dirname(__FILE__), "/../../tmp")
+  FileUtils.mkdir(dir) unless test ?d, dir
+  @path = "#{dir}/current_example.rb"
   File.open(@path, "w") do |f|
     f.write spec
   end
@@ -19,8 +21,8 @@ When /^I run it with the (.*)$/ do |interpreter|
     when /^ruby interpreter/
       args = interpreter.gsub('ruby interpreter','')
       ruby("#{@path}#{args}", stderr_file.path)
-    when /^spec script/
-      args = interpreter.gsub('spec script','')
+    when /^spec command/
+      args = interpreter.gsub('spec command','')
       spec("#{@path}#{args}", stderr_file.path)
     when 'CommandLine object' then cmdline(@path, stderr_file.path)
     else raise "Unknown interpreter: #{interpreter}"

data/features/support/env.rb

@@ -16,7 +16,7 @@ module RspecWorld
   end
 
   def cmdline(args, stderr)
-    ruby("#{File.dirname(__FILE__) + '/helpers/cmdline.rb'} #{args}", stderr)
+    ruby("#{File.dirname(__FILE__) + '/../../resources/helpers/cmdline.rb'} #{args}", stderr)
   end
 end
 

data/features-pending/cli/conditional_exclusion.feature

@@ -0,0 +1,39 @@
+Feature: conditional exclusion of example groups
+  
+  Example groups can be excluded from a run by matching the value of the
+  --exclude argument against options passed to an example group. The value
+  can be a key or a key:value pair (separated by a ":").
+  
+  Scenario: exclusion using explicit value
+    Given the following spec:
+      """
+      describe "This should run" do
+        it { 5.should == 5 }
+      end
+      
+      describe "This should not run", :slow => true do
+        it { 1_000_000.times { 5.should == 5 } }
+      end
+      """
+    When I run it with the spec command --format specdoc --exclude slow:true
+    Then the exit code should be 0
+    And the stdout should match "1 example, 0 failures"
+    And the stdout should match /This should run$/m
+    But the stdout should not match "This should not run"
+
+  Scenario: exclusion using default value (true)
+    Given the following spec:
+      """
+      describe "This should run" do
+        it { 5.should == 5 }
+      end
+
+      describe "This should not run", :slow => true do
+        it { 1_000_000.times { 5.should == 5 } }
+      end
+      """
+    When I run it with the spec command --format specdoc --exclude slow
+    Then the exit code should be 0
+    And the stdout should match "1 example, 0 failures"
+    And the stdout should match /This should run$/m
+    But the stdout should not match "This should not run"

data/lib/{adapters → spec/adapters}/mock_frameworks/flexmock.rb

@@ -3,6 +3,7 @@
 #  Created by Jim Weirich on 2007-04-10.
 #  Copyright (c) 2007. All rights reserved.
 
+require 'rubygems'
 require 'flexmock/rspec'
 
 module Spec

data/lib/{adapters → spec/adapters}/mock_frameworks/mocha.rb

@@ -1,3 +1,4 @@
+require 'rubygems'
 require 'mocha/standalone'
 require 'mocha/object'
 

data/lib/{adapters → spec/adapters}/mock_frameworks/rr.rb

@@ -1,3 +1,4 @@
+require 'rubygems'
 require 'rr'
 
 patterns = ::Spec::Runner::QuietBacktraceTweaker::IGNORE_PATTERNS

data/lib/{adapters → spec/adapters}/mock_frameworks/rspec.rb

@@ -1,4 +1,3 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "spec", "mocks"))
 require 'spec/mocks/framework'
 require 'spec/mocks/extensions'
 

data/lib/spec/autorun.rb

@@ -0,0 +1,3 @@
+require 'spec'
+
+Spec::Runner.autorun

data/lib/spec/example/before_and_after_hooks.rb

@@ -37,21 +37,14 @@ module Spec
         after_parts(*args) << block
       end
 
-      # TODO - deprecate this unless there is a reason why it exists
-      def remove_after(scope, &block) # :nodoc:
-        after_each_parts.delete(block)
-      end
-
-      # Deprecated. Use before(:each)
-      def setup(&block)
-        before(:each, &block)
+      def before_each_parts # :nodoc:
+        @before_each_parts ||= []
       end
 
-      # Deprecated. Use after(:each)
-      def teardown(&block)
-        after(:each, &block)
+      def after_each_parts # :nodoc:
+        @after_each_parts ||= []
       end
-
+      
       def before_all_parts # :nodoc:
         @before_all_parts ||= []
       end
@@ -60,14 +53,6 @@ module Spec
         @after_all_parts ||= []
       end
 
-      def before_each_parts # :nodoc:
-        @before_each_parts ||= []
-      end
-
-      def after_each_parts # :nodoc:
-        @after_each_parts ||= []
-      end
-      
       def before_suite_parts
         BeforeAndAfterHooks.before_suite_parts
       end

data/lib/spec/example/example_description.rb

@@ -0,0 +1,15 @@
+module Spec
+  module Example
+    class ExampleDescription
+      attr_reader :description, :options, :backtrace
+      
+      def initialize(description, options={}, backtrace=nil)
+        @description, @options, @backtrace = description, options, backtrace
+      end
+      
+      def ==(other)
+        (other.description == description) & (other.backtrace == backtrace)
+      end
+    end
+  end
+end

data/lib/spec/example/example_group.rb

@@ -5,22 +5,7 @@ module Spec
     class ExampleGroup
       extend Spec::Example::ExampleGroupMethods
       include Spec::Example::ExampleMethods
-
-      def initialize(defined_description, options={}, &implementation)
-        @_options = options
-        @_defined_description = defined_description
-        @_implementation = implementation || pending_implementation
-        @_backtrace = caller
-      end
-      
-    private
-      
-      def pending_implementation
-        error = NotYetImplementedError.new(caller)
-        lambda { raise(error) }
-      end
     end
   end
 end
 
-Spec::ExampleGroup = Spec::Example::ExampleGroup

data/lib/spec/example/example_group_factory.rb

@@ -1,5 +1,6 @@
 module Spec
   module Example
+    
     class ExampleGroupFactory
       module ClassMethods
         def reset
@@ -7,13 +8,27 @@ module Spec
           default(ExampleGroup)
         end
 
-        def registered_or_ancestor_of_registered?(example_group_classes) # :nodoc:
-          example_group_classes.each do |example_group_class|
-            return false unless registered_types.any? do |registered_type|
-              registered_type.ancestors.include? example_group_class
-            end
+        def example_group_creation_listeners
+          @example_group_creation_listeners ||= []
+        end
+
+        def register_example_group(klass)
+          example_group_creation_listeners.each do |listener|
+            listener.register_example_group(klass)
           end
-          return true
+        end
+
+        def create_shared_example_group(*args, &example_group_block) # :nodoc:
+          ::Spec::Example::add_spec_path_to(args)
+          ::Spec::Example::SharedExampleGroup.register(*args, &example_group_block)
+        end
+        
+        def create_example_group(*args, &block)
+          raise ArgumentError if args.empty?
+          raise ArgumentError unless block
+          Spec::Example::add_spec_path_to(args)
+          superclass = determine_superclass(args.last)
+          superclass.describe(*args, &block)
         end
 
         # Registers an example group class +klass+ with the symbol +type+. For
@@ -31,44 +46,22 @@ module Spec
         # implicitly use an instance of FarmExampleGroup for any file loaded
         # from the <tt>./spec/farm</tt> directory.
         def register(key, example_group_class)
-          @example_group_types[key] = example_group_class
+          @example_group_types[key.to_sym] = example_group_class
         end
-        
+
         # Sets the default ExampleGroup class
         def default(example_group_class)
+          Spec.__send__ :remove_const, :ExampleGroup if Spec.const_defined?(:ExampleGroup)
+          Spec.const_set(:ExampleGroup, example_group_class)
           old = @example_group_types
           @example_group_types = Hash.new(example_group_class)
           @example_group_types.merge!(old) if old
         end
 
-        def get(key=nil)
-          if @example_group_types.values.include?(key)
-            key
-          else
-            @example_group_types[key]
-          end
-        end
-        
-        def create_example_group(*args, &block)
-          raise ArgumentError if args.empty?
-          raise ArgumentError unless block
-          Spec::Example::add_spec_path_to(args)
-          superclass = determine_superclass(args.last)
-          superclass.describe(*args, &block)
-        end
-        
-        def create_shared_example_group(*args, &block)
-          Spec::Example::add_spec_path_to(args)
-          SharedExampleGroup.register(*args, &block)
+        def [](key)
+          @example_group_types[key]
         end
-        
-        def include_constants_in(context, &block)
-          if (Spec::Ruby.version.to_f >= 1.9 && Module === context && !(Class === context))
-            return lambda {include context;instance_eval(&block)}
-          end
-          block
-        end
-        
+
         def assign_scope(scope, args)
           args.last[:scope] = scope
         end
@@ -76,18 +69,13 @@ module Spec
       protected
 
         def determine_superclass(opts)
-          key = if opts[:type]
-            opts[:type]
-          elsif opts[:spec_path] =~ /spec(\\|\/)(#{@example_group_types.keys.join('|')})/
-            $2 == '' ? nil : $2.to_sym
+          if type = opts[:type]
+            self[type]
+          elsif opts[:spec_path] =~ /spec(\\|\/)(#{@example_group_types.keys.sort_by{|k| k.to_s.length}.reverse.join('|')})/
+            self[$2 == '' ? nil : $2.to_sym]
+          else
+            self[nil]
           end
-          get(key)
-        end
-        
-      private
-        
-        def registered_types
-          @example_group_types.values
         end
 
       end

data/lib/spec/example/example_group_hierarchy.rb

@@ -0,0 +1,53 @@
+module Spec
+  module Example
+    class ExampleGroupHierarchy < Array
+      def initialize(example_group_class)
+        push example_group_class
+        if example_group_class.respond_to?(:superclass) && example_group_class.superclass.respond_to?(:example_group_hierarchy)
+          unshift example_group_class.superclass.example_group_hierarchy
+          flatten!
+        end
+      end
+      
+      def run_before_all(example)
+        example.eval_each_fail_fast(before_all_parts)
+      end
+      
+      def run_before_each(example)
+        example.eval_each_fail_fast(before_each_parts)
+      end
+      
+      def run_after_each(example)
+        example.eval_each_fail_slow(after_each_parts)
+      end
+      
+      def run_after_all(example)
+        example.eval_each_fail_slow(after_all_parts)
+      end
+      
+      def before_all_parts
+        @before_all_parts ||= collect {|klass| klass.before_all_parts}.flatten
+      end
+      
+      def before_each_parts
+        @before_each_parts ||= collect {|klass| klass.before_each_parts}.flatten
+      end
+      
+      def after_each_parts
+        @after_each_parts ||= reverse.collect {|klass| klass.after_each_parts}.flatten
+      end
+      
+      def after_all_parts
+        @after_all_parts ||= reverse.collect {|klass| klass.after_all_parts}.flatten
+      end
+      
+      def nested_descriptions
+        @nested_descriptions ||= collect {|eg| nested_description_from(eg) == "" ? nil : nested_description_from(eg) }.compact
+      end
+      
+      def nested_description_from(example_group)
+        example_group.description_args.join
+      end
+    end
+  end
+end