rspec-core 2.0.0.beta.22 → 2.0.0.rc

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

@@ -1,3 +1,5 @@
+require 'rspec/core/formatters/base_formatter'
+
 module RSpec
   module Core
     module Formatters

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

@@ -1,3 +1,5 @@
+require 'rspec/core/formatters/base_text_formatter'
+
 module RSpec
   module Core
     module Formatters

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

@@ -1,3 +1,4 @@
+require 'rspec/core/formatters/base_text_formatter'
 module RSpec
   module Core
     module Formatters

data/lib/rspec/core/metadata.rb

@@ -10,12 +10,10 @@ module RSpec
         end
 
         store(:example_group, example_group || {})
-        store(:behaviour, self[:example_group])
         yield self if block_given?
       end
 
       RESERVED_KEYS = [
-        :behaviour,
         :description,
         :example_group,
         :execution_result,
@@ -29,9 +27,9 @@ module RSpec
         user_metadata = args.last.is_a?(Hash) ? args.pop : {}
         ensure_valid_keys(user_metadata)
 
-        self[:example_group][:describes] = described_class_from(args)
-        self[:example_group][:description] = description_from(args)
-        self[:example_group][:full_description] = full_description_from(args)
+        self[:example_group][:describes] = described_class_from(*args)
+        self[:example_group][:description] = description_from(*args)
+        self[:example_group][:full_description] = full_description_from(*args)
 
         self[:example_group][:block] = user_metadata.delete(:example_group_block)
         self[:example_group][:caller] = user_metadata.delete(:caller) || caller(1)
@@ -126,19 +124,28 @@ EOM
         @superclass_metadata ||= { :example_group => {} }
       end
 
-      def description_from(args)
-        @description_from_args ||= args.map{|a| a.to_s.strip}.join(" ")
+      def description_from(*args)
+        args.inject("") do |result, a|
+          a = a.to_s.strip
+          if result == ""
+            a
+          elsif a =~ /^(#|::|\.)/
+            "#{result}#{a}"
+          else
+            "#{result} #{a}"
+          end
+        end
       end
 
-      def full_description_from(args)
+      def full_description_from(*args)
         if superclass_metadata[:example_group][:full_description]
-          "#{superclass_metadata[:example_group][:full_description]} #{description_from(args)}"
+          description_from(superclass_metadata[:example_group][:full_description], *args)
         else
-          description_from(args)
+          description_from(*args)
         end
       end
 
-      def described_class_from(args)
+      def described_class_from(*args)
         if args.first.is_a?(String) || args.first.is_a?(Symbol)
           superclass_metadata[:example_group][:describes]
         else

data/lib/rspec/core/option_parser.rb

@@ -9,9 +9,10 @@ module RSpec::Core
     end
 
     def parse!(args)
+      return {} if args.empty?
       if args.include?("--formatter")
-        args[args.index("--formatter")] = "--format"
         RSpec.deprecate("the --formatter option", "-f or --format")
+        args[args.index("--formatter")] = "--format"
       end
       options = {}
       parser(options).parse!(args)
@@ -50,6 +51,10 @@ module RSpec::Core
           options[:formatter] = o
         end
 
+        parser.on('-o', '--out FILE', 'output to a file instead of STDOUT') do |o|
+          options[:output_stream] = o
+        end
+
         parser.on_tail('-h', '--help', "You're looking at it.") do
           puts parser
           exit

data/lib/rspec/core/rake_task.rb

@@ -1,11 +1,11 @@
 #!/usr/bin/env ruby
 
+require 'rspec/core/deprecation'
 require 'rake'
 require 'rake/tasklib'
 
 module RSpec
   module Core
-
     class RakeTask < ::Rake::TaskLib
 
       # Name of task.
@@ -46,7 +46,7 @@ module RSpec
       # executed spec command to stdout.
       #
       # default:
-      #   false
+      #   true
       attr_accessor :verbose
 
       # Use rcov for code coverage?
@@ -89,7 +89,7 @@ module RSpec
         @name = args.shift || :spec
         @pattern, @rcov_path, @rcov_opts, @ruby_opts, @rspec_opts = nil, nil, nil, nil, nil
         @warning, @rcov = false, false
-        @fail_on_error = true
+        @verbose, @fail_on_error = true, true
 
         yield self if block_given?
 
@@ -103,22 +103,23 @@ module RSpec
             if files_to_run.empty?
               puts "No examples matching #{pattern} could be found"
             else
-              puts spec_command.inspect if verbose
-              unless ruby(spec_command)
-                STDERR.puts failure_message if failure_message
-                raise("#{spec_command} failed") if fail_on_error
+              begin
+                ruby(spec_command)
+              rescue
+                puts failure_message if failure_message
+                raise("ruby #{spec_command} failed") if fail_on_error
               end
             end
           end
         end
       end
 
+    private
+
       def files_to_run # :nodoc:
         FileList[ pattern ].map { |f| %["#{f}"] }
       end
 
-    private
-
       def spec_command
         @spec_command ||= begin
                             cmd_parts = [ruby_opts]
@@ -155,6 +156,5 @@ module RSpec
       end
 
     end
-
   end
 end

data/lib/rspec/core/runner.rb

@@ -4,8 +4,27 @@ module RSpec
   module Core
     class Runner
 
+      def self.autorun
+        return if autorun_disabled? || installed_at_exit? || running_in_drb?
+        @installed_at_exit = true
+        at_exit { run(ARGV, $stderr, $stdout) ? exit(0) : exit(1) }
+      end
+
+      def self.autorun_disabled?
+        @autorun_disabled ||= false
+      end
+
       def self.disable_autorun!
-        RSpec.deprecate("disable_autorun!")
+        @autorun_disabled = true
+      end
+
+      def self.installed_at_exit?
+        @installed_at_exit ||= false
+      end
+
+      def self.running_in_drb?
+        (DRb.current_server rescue false) &&
+        !!((DRb.current_server.uri) =~ /druby\:\/\/127.0.0.1\:/)
       end
 
       def self.trap_interrupt

data/lib/rspec/core/subject.rb

@@ -1,3 +1,5 @@
+require 'ostruct'
+
 module RSpec
   module Core
     module Subject
@@ -86,7 +88,7 @@ module RSpec
         # with dots, the result is as though you concatenated that +String+
         # onto the subject in an expression.
         #   
-        #   describe Person 
+        #   describe Person do
         #     let(:person) do
         #       person = Person.new
         #       person.phone_numbers << "555-1212"
@@ -94,13 +96,34 @@ module RSpec
         #
         #     its("phone_numbers.first") { should == "555-1212" }
         #   end
+        #
+        # When the subject is a +Hash+, you can refer to the Hash keys by
+        # specifying a +Symbol+ or +String+ in an array.
+        #
+        #   describe "a configuration Hash" do
+        #     subject do
+        #       { :max_users => 3,
+        #         'admin' => :all_permissions }
+        #     end
+        #
+        #     its([:max_users]) { should == 3 }
+        #     its(['admin']) { should == :all_permissions }
+        #
+        #     # You can still access to its regular methods this way:
+        #     its(:keys) { should include(:max_users) }
+        #     its(:count) { should == 2 }
+        #   end
         def its(attribute, &block)
           describe(attribute) do
             example do
               self.class.class_eval do
                 define_method(:subject) do
-                  attribute.to_s.split('.').inject(super()) do |target, method|
-                    target.send(method)
+                  if super().is_a?(Hash) && attribute.is_a?(Array)
+                    OpenStruct.new(super()).send(attribute.first)
+                  else
+                    attribute.to_s.split('.').inject(super()) do |target, method|
+                      target.send(method)
+                    end
                   end
                 end
               end

data/lib/rspec/core/version.rb

@@ -1,7 +1,7 @@
 module RSpec # :nodoc:
   module Core # :nodoc:
     module Version # :nodoc:
-      STRING = '2.0.0.beta.22'
+      STRING = '2.0.0.rc'
     end
   end
 end

data/lib/rspec/core/world.rb

@@ -2,7 +2,8 @@ module RSpec
   module Core
     class World
 
-      attr_reader :example_groups, :filtered_examples
+      attr_reader :example_groups, :filtered_examples, :wants_to_quit
+      attr_writer :wants_to_quit
 
       def initialize(configuration=RSpec.configuration)
         @configuration = configuration

data/spec/autotest/failed_results_re_spec.rb

@@ -6,7 +6,7 @@ describe "failed_results_re for autotest" do
   let(:example_output) do
     group = RSpec::Core::ExampleGroup.describe("group name")
     example = group.example("example name") { "this".should eq("that") }
-    group.run_all(formatter)
+    group.run(formatter)
     RSpec.configuration.stub(:color_enabled?) { false }
     formatter.dump_failures
     output.string

data/spec/rspec/core/configuration_spec.rb

@@ -278,6 +278,19 @@ module RSpec::Core
         config.formatter.should be_an_instance_of(RSpec::CustomFormatter)
       end
 
+      it "requires and sets a formatter based on its class fully qualified name" do
+        config.should_receive(:require).with('rspec/custom_formatter2') do
+          RSpec.const_set("CustomFormatter2", Class.new(Formatters::BaseFormatter))
+        end
+        config.formatter = "RSpec::CustomFormatter2"
+        config.formatter.should be_an_instance_of(RSpec::CustomFormatter2)
+      end
+
+      it "raises NameError if class is unresolvable" do
+        config.should_receive(:require).with('rspec/custom_formatter3')
+        lambda { config.formatter = "RSpec::CustomFormatter3" }.should raise_error(NameError)
+      end
+
       it "raises ArgumentError if formatter is unknown" do
         lambda { config.formatter = :progresss }.should raise_error(ArgumentError)
       end

data/spec/rspec/core/example_group_spec.rb

@@ -25,7 +25,7 @@ module RSpec::Core
           end
         end
 
-        group.run_all
+        group.run
         examples_run.should have(1).example
       end
 
@@ -44,7 +44,7 @@ module RSpec::Core
             end
           end
 
-          group.run_all
+          group.run
           examples_run.should have(2).examples
         end
       end
@@ -158,7 +158,7 @@ module RSpec::Core
               end
             end
 
-            group.run_all.should be_true
+            group.run.should be_true
           end
         end
       end
@@ -216,7 +216,7 @@ module RSpec::Core
         group.before(:all) { order << 3 }
         group.example("example") {}
 
-        group.run_all
+        group.run
 
         order.should == [1,2,3]
       end
@@ -229,7 +229,7 @@ module RSpec::Core
         group.before(:each) { order << 3 }
         group.example("example") {}
 
-        group.run_all
+        group.run
 
         order.should == [1,2,3]
       end
@@ -242,7 +242,7 @@ module RSpec::Core
         group.after(:each) { order << 3 }
         group.example("example") {}
 
-        group.run_all
+        group.run
 
         order.should == [3,2,1]
       end
@@ -255,11 +255,42 @@ module RSpec::Core
         group.after(:all) { order << 3 }
         group.example("example") {}
 
-        group.run_all
+        group.run
 
         order.should == [3,2,1]
       end
 
+      it "only runs before/after(:all) hooks from example groups that have specs that run" do
+        hooks_run = []
+
+        RSpec.configure do |c|
+          c.filter_run :focus => true
+        end
+
+        unfiltered_group = ExampleGroup.describe "unfiltered" do
+          before(:all) { hooks_run << :unfiltered_before_all }
+          after(:all)  { hooks_run << :unfiltered_after_all  }
+
+          context "a subcontext" do
+            it("has an example") { }
+          end
+        end
+
+        filtered_group = ExampleGroup.describe "filtered", :focus => true do
+          before(:all) { hooks_run << :filtered_before_all }
+          after(:all)  { hooks_run << :filtered_after_all  }
+
+          context "a subcontext" do
+            it("has an example") { }
+          end
+        end
+
+        unfiltered_group.run
+        filtered_group.run
+
+        hooks_run.should == [:filtered_before_all, :filtered_after_all]
+      end
+
       it "runs before_all_defined_in_config, before all, before each, example, after each, after all, after_all_defined_in_config in that order" do
         order = []
 
@@ -283,7 +314,7 @@ module RSpec::Core
         context2.after(:all) { order << :nested_after_all }
         context2.example("nested example 2") { order << :nested_example_2 }
 
-        group.run_all
+        group.run
 
         order.should == [
           :before_all_defined_in_config,
@@ -311,7 +342,7 @@ module RSpec::Core
         group.example("ignore") {  }
 
         expect do
-          group.run_all
+          group.run
         end.to_not raise_error
       end
 
@@ -319,7 +350,7 @@ module RSpec::Core
         group = ExampleGroup.describe
         group.before(:each) { raise "error in before each" }
         example = group.example("equality") { 1.should == 2}
-        group.run_all
+        group.run
 
         example.metadata[:execution_result][:exception_encountered].message.should == "error in before each"
       end
@@ -328,7 +359,24 @@ module RSpec::Core
         group = ExampleGroup.describe
         group.before(:all) { raise "error in before all" }
         example = group.example("equality") { 1.should == 2}
-        group.run_all
+        group.run
+
+        example.metadata.should_not be_nil
+        example.metadata[:execution_result].should_not be_nil
+        example.metadata[:execution_result][:exception_encountered].should_not be_nil
+        example.metadata[:execution_result][:exception_encountered].message.should == "error in before all"
+      end
+
+      it "treats an error in before(:all) as a failure for a spec in a nested group" do
+        example = nil
+        group = ExampleGroup.describe do
+          before(:all) { raise "error in before all" }
+
+          describe "nested" do
+            example = it("equality") { 1.should == 2}
+          end
+        end
+        group.run
 
         example.metadata.should_not be_nil
         example.metadata[:execution_result].should_not be_nil
@@ -341,7 +389,7 @@ module RSpec::Core
         running_example = :none
         group.before(:all) { running_example = example }
         group.example("no-op") { }
-        group.run_all
+        group.run
         running_example.should == nil
       end
 
@@ -350,7 +398,7 @@ module RSpec::Core
         option = nil
         group.before(:each) { option = example.options[:data] }
         group.example("no-op", :data => :sample) { }
-        group.run_all
+        group.run
         option.should == :sample
       end
 
@@ -359,7 +407,7 @@ module RSpec::Core
         option = nil
         group.after(:each) { option = example.options[:data] }
         group.example("no-op", :data => :sample) { }
-        group.run_all
+        group.run
         option.should == :sample
       end
 
@@ -368,7 +416,7 @@ module RSpec::Core
         running_example = :none
         group.after(:all) { running_example = example }
         group.example("no-op") { }
-        group.run_all
+        group.run
         running_example.should == nil
       end
     end
@@ -381,6 +429,13 @@ module RSpec::Core
         group.examples.size.should == 1
       end
 
+      it "allows adding a pending example using 'xit'" do
+        group = ExampleGroup.describe
+        group.xit("is pending") { }
+        group.run
+        group.examples.first.should be_pending
+      end
+
       it "exposes all examples at examples" do
         group = ExampleGroup.describe
         group.it("should do something 1") { }
@@ -518,14 +573,6 @@ module RSpec::Core
     end
 
     describe "#its" do
-      its(:class) { should == RSpec::Core::ExampleGroup }
-      it "does not interfere between examples" do
-        subject.class.should == RSpec::Core::ExampleGroup
-      end
-      context "subject modified in before block" do
-        before { subject.class.should == RSpec::Core::ExampleGroup }
-      end
-
       context "with nil value" do
         subject do
           Class.new do
@@ -549,6 +596,24 @@ module RSpec::Core
         its("name.size.class") { should == Fixnum }
       end
 
+      context "when it is a Hash" do
+        subject do
+          { :attribute => 'value',
+            'another_attribute' => 'another_value' }
+        end
+        its([:attribute]) { should == 'value' }
+        its([:attribute]) { should_not == 'another_value' }
+        its([:another_attribute]) { should == 'another_value' }
+        its([:another_attribute]) { should_not == 'value' }
+        its(:keys) { should =~ ['another_attribute', :attribute] }
+
+        context "when referring to an attribute without the proper array syntax" do
+          it "raises a NoMethodError" do
+            expect{ its(:attribute) }.to raise_error(NoMethodError)
+          end
+        end
+      end
+
       context "calling and overriding super" do
         it "calls to the subject defined in the parent group" do
           group = ExampleGroup.describe(Array) do
@@ -563,9 +628,10 @@ module RSpec::Core
             end
           end
 
-          group.run_all.should be_true
+          group.run.should be_true
         end
       end
+
     end
 
     describe "#top_level_description" do
@@ -585,10 +651,25 @@ module RSpec::Core
     describe "#run" do
       let(:reporter) { double("reporter").as_null_object }
 
+      context "with fail_fast? => true" do
+        it "does not run examples after the failed example" do
+          group = RSpec::Core::ExampleGroup.describe
+          group.stub(:fail_fast?) { true }
+          examples_run = []
+          group.example('example 1') { examples_run << self }
+          group.example('example 2') { examples_run << self; fail; }
+          group.example('example 3') { examples_run << self }
+
+          group.run
+
+          examples_run.length.should eq(2)
+        end
+      end
+
       context "with RSpec.wants_to_quit=true" do
         before do
-          RSpec.stub(:clear_remaining_example_groups)
-          RSpec.stub(:wants_to_quit) { true }
+          RSpec.world.stub(:example_groups) { [] }
+          RSpec.world.stub(:wants_to_quit) { true }
         end
 
         it "returns without starting the group" do