rspec-core 2.14.8 → 2.99.0.beta1

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

@@ -6,18 +6,6 @@ module RSpec
     module Formatters
       # Formats backtraces so they're clickable by TextMate
       class TextMateFormatter < HtmlFormatter
-        class NonEscapingHtmlPrinter < RSpec::Core::Formatters::HtmlPrinter
-          def print_example_failed(pending_fixed, description, run_time, failure_id, exception, extra_content, escape_backtrace = false)
-            # Call implementation from superclass, but ignore `escape_backtrace` and always pass `false` instead.
-            super(pending_fixed, description, run_time, failure_id, exception, extra_content, false)
-          end
-        end
-
-        def initialize(output)
-          super
-          @printer = NonEscapingHtmlPrinter.new(output)
-        end
-
         def backtrace_line(line, skip_textmate_conversion=false)
           if skip_textmate_conversion
             super(line)

data/lib/rspec/core/hooks.rb

@@ -18,7 +18,7 @@ module RSpec
 
       class BeforeHook < Hook
         def run(example)
-          example.instance_eval(&block)
+          example.instance_eval_with_args(example, &block)
         end
 
         def display_name

data/lib/rspec/core/memoized_helpers.rb

@@ -93,15 +93,12 @@ module RSpec
       # memoized hash when used in a `before(:all)` hook.
       #
       # @private
-      class BeforeAllMemoizedHash
-        def initialize(example_group_instance)
-          @example_group_instance = example_group_instance
-          @hash = {}
-        end
+      class AllHookMemoizedHash
+        def self.isolate_for_all_hook(example_group_instance)
+          hash_type = self
 
-        def self.isolate_for_before_all(example_group_instance)
           example_group_instance.instance_eval do
-            @__memoized = BeforeAllMemoizedHash.new(self)
+            @__memoized = hash_type.new(example_group_instance)
 
             begin
               yield
@@ -112,6 +109,11 @@ module RSpec
           end
         end
 
+        def initialize(example_group_instance)
+          @example_group_instance = example_group_instance
+          @hash = {}
+        end
+
         def fetch(key, &block)
           description = if key == :subject
             "subject"
@@ -120,17 +122,16 @@ module RSpec
           end
 
           ::RSpec.warn_deprecation <<-EOS
-WARNING: #{description} accessed in a `before(:all)` hook at:
-  #{caller[1]}
-
-This is deprecated behavior that will not be supported in RSpec 3.
+DEPRECATION: #{description} accessed in #{article} #{hook_expression} hook at:
+  #{CallerFilter.first_non_rspec_line}
 
 `let` and `subject` declarations are not intended to be called
-in a `before(:all)` hook, as they exist to define state that
-is reset between each example, while `before(:all)` exists to
-define state that is shared across examples in an example group.
-EOS
+in #{article} #{hook_expression} hook, as they exist to define state that
+is reset between each example, while #{hook_expression} exists to
+#{hook_intention}.
 
+This is deprecated behavior that will not be supported in RSpec 3.
+EOS
           @hash.fetch(key, &block)
         end
 
@@ -148,6 +149,34 @@ EOS
             end
           end
         end
+
+        class Before < self
+          def hook_expression
+            "`before(:all)`"
+          end
+
+          def article
+            "a"
+          end
+
+          def hook_intention
+            "define state that is shared across examples in an example group"
+          end
+        end
+
+        class After < self
+          def hook_expression
+            "`after(:all)`"
+          end
+
+          def article
+            "an"
+          end
+
+          def hook_intention
+            "cleanup state that is shared across examples in an example group"
+          end
+        end
       end
 
       def self.included(mod)
@@ -195,8 +224,10 @@ EOS
 
           # Apply the memoization. The method has been defined in an ancestor
           # module so we can use `super` here to get the value.
-          define_method(name) do
-            __memoized.fetch(name) { |k| __memoized[k] = super(&nil) }
+          if block.arity == 1
+            define_method(name) { __memoized.fetch(name) { |k| __memoized[k] = super(RSpec.current_example, &nil) } }
+          else
+            define_method(name) { __memoized.fetch(name) { |k| __memoized[k] = super(&nil) } }
           end
         end
 
@@ -424,6 +455,7 @@ EOS
         #     its(:age) { should eq(25) }
         #   end
         def its(attribute, &block)
+          RSpec.deprecate("Use of rspec-core's `its` method", :replacement => 'the rspec-its gem')
           describe(attribute) do
             if Array === attribute
               let(:__its_subject) { subject[*attribute] }

data/lib/rspec/core/metadata.rb

@@ -273,7 +273,7 @@ module RSpec
 RSpec reserves some hash keys for its own internal use,
 including :#{key}, which is used on:
 
-            #{caller(0)[4]}.
+            #{CallerFilter.first_non_rspec_line}.
 
 Here are all of RSpec's reserved hash keys:
 

data/lib/rspec/core/option_parser.rb

@@ -63,12 +63,17 @@ module RSpec::Core
         end
 
         parser.on('--order TYPE[:SEED]', 'Run examples by the specified order type.',
-                  '  [default] files are ordered based on the underlying file',
-                  '            system\'s order',
+                  '  [defined] groups and examples are run in the order they are defined',
+                  '  [default] deprecated alias for defined',
                   '  [rand]    randomize the order of files, groups and examples',
                   '  [random]  alias for rand',
                   '  [random:SEED] e.g. --order random:123') do |o|
-          options[:order] = o
+          options[:order] = if o == 'default'
+                              RSpec.deprecate("RSpec's `--order default` CLI option", :replacement => "`--order defined`", :call_site => nil)
+                              'defined'
+                            else
+                              o
+                            end
         end
 
         parser.on('--seed SEED', Integer, 'Equivalent of --order rand:SEED.') do |seed|

data/lib/rspec/core/pending.rb

@@ -72,7 +72,7 @@ module RSpec
       #         # ...
       #       end
       def pending(*args)
-        return self.class.before(:each) { pending(*args) } unless example
+        return self.class.before(:each) { pending(*args) } unless RSpec.current_example
 
         options = args.last.is_a?(Hash) ? args.pop : {}
         message = args.first || NO_REASON_GIVEN
@@ -81,24 +81,23 @@ module RSpec
           return block_given? ? yield : nil
         end
 
-        example.metadata[:pending] = true
-        example.metadata[:execution_result][:pending_message] = message
-        example.execution_result[:pending_fixed] = false
+        RSpec.current_example.metadata[:pending] = true
+        RSpec.current_example.metadata[:execution_result][:pending_message] = message
+        RSpec.current_example.execution_result[:pending_fixed] = false
         if block_given?
           begin
             result = begin
                        yield
-                       example.example_group_instance.instance_eval { verify_mocks_for_rspec }
-                       true
+                       RSpec.current_example.example_group_instance.instance_eval { verify_mocks_for_rspec }
                      end
-            example.metadata[:pending] = false
+            RSpec.current_example.metadata[:pending] = false
           rescue Exception => e
-            example.execution_result[:exception] = e
+            RSpec.current_example.execution_result[:exception] = e
           ensure
             teardown_mocks_for_rspec
           end
           if result
-            example.execution_result[:pending_fixed] = true
+            RSpec.current_example.execution_result[:pending_fixed] = true
             raise PendingExampleFixedError.new
           end
         end
@@ -108,6 +107,11 @@ module RSpec
 
     # Alias the error for compatibility with extension gems (e.g. formatters)
     # that depend on the const name of the error in RSpec <= 2.8.
-    PendingExampleFixedError = Pending::PendingExampleFixedError
+    def self.const_missing(name)
+      return super unless name == :PendingExampleFixedError
+
+      RSpec.deprecate("RSpec::Core::PendingExampleFixedError", :replacement => "RSpec::Core::Pending::PendingExampleFixedError")
+      Pending::PendingExampleFixedError
+    end
   end
 end

data/lib/rspec/core/rake_task.rb

@@ -68,19 +68,43 @@ module RSpec
       #
       # default:
       #   false
-      attr_accessor :rcov
+      def rcov
+        deprecate("RSpec::Core::RakeTask#rcov")
+        @rcov
+      end
+
+      def rcov=(true_or_false)
+        deprecate("RSpec::Core::RakeTask#rcov=")
+        @rcov = true_or_false
+      end
 
       # Path to rcov.
       #
       # default:
       #   'rcov'
-      attr_accessor :rcov_path
+      def rcov_path
+        deprecate("RSpec::Core::RakeTask#rcov_path")
+        @rcov_path
+      end
+
+      def rcov_path=(path)
+        deprecate("RSpec::Core::RakeTask#rcov_path=")
+        @rcov_path = path
+      end
 
       # Command line options to pass to rcov.
       #
       # default:
       #   nil
-      attr_accessor :rcov_opts
+      def rcov_opts
+        deprecate("RSpec::Core::RakeTask#rcov_opts")
+        @rcov_opts
+      end
+
+      def rcov_opts=(opts)
+        deprecate("RSpec::Core::RakeTask#rcov_opts=")
+        @rcov_opts = opts
+      end
 
       # Command line options to pass to ruby.
       #
@@ -174,15 +198,15 @@ module RSpec
         cmd_parts << ruby_opts
         cmd_parts << "-w" if @warning
         cmd_parts << "-S" << runner
-        cmd_parts << "-Ispec:lib" << rcov_opts if rcov
+        cmd_parts << "-Ispec:lib" << @rcov_opts if @rcov
         cmd_parts << files_to_run
-        cmd_parts << "--" if rcov && rspec_opts
+        cmd_parts << "--" if @rcov && rspec_opts
         cmd_parts << rspec_opts
         cmd_parts.flatten.reject(&blank).join(" ")
       end
 
       def runner
-        rcov ? rcov_path : rspec_path
+        @rcov ? @rcov_path : rspec_path
       end
 
       def blank

data/lib/rspec/core/runner.rb

@@ -68,6 +68,15 @@ module RSpec
         options = ConfigurationOptions.new(args)
         options.parse_options
 
+        major, minor, point = RUBY_VERSION.split('.').map { |v| v.to_i }
+
+        if major == 1 && ( (minor == 9 && point < 2) || (minor == 8 && point < 7) )
+          RSpec.deprecate "RSpec support for Ruby #{RUBY_VERSION}",
+                          :replacement => "1.8.7 or >= 1.9.2",
+                          :call_site   => nil
+        end
+
+
         if options.options[:drb]
           require 'rspec/core/drb_command_line'
           begin

data/lib/rspec/core/shared_example_group.rb

@@ -80,7 +80,7 @@ module RSpec
       # objects.
       class Registry
         def add_group(source, *args, &block)
-          ensure_block_has_source_location(block, caller[1])
+          ensure_block_has_source_location(block, CallerFilter.first_non_rspec_line)
 
           if key? args.first
             key = args.shift
@@ -167,14 +167,16 @@ module RSpec
           shared_example_groups[source][key]
         end
 
-        def ensure_block_has_source_location(block, caller_line)
-          return if block.respond_to?(:source_location)
-
-          block.extend Module.new {
-            define_method :source_location do
-              caller_line.split(':')
-            end
-          }
+        if Proc.method_defined?(:source_location)
+          def ensure_block_has_source_location(block, caller_line); end
+        else # for 1.8.7
+          def ensure_block_has_source_location(block, caller_line)
+            block.extend Module.new {
+              define_method :source_location do
+                caller_line.split(':')
+              end
+            }
+          end
         end
       end
     end

data/lib/rspec/core/shared_example_group/collection.rb

@@ -27,12 +27,14 @@ module RSpec
 
           def warn_deprecation_and_fetch_anyway(key)
             if (example = fetch_anyway key)
-              backtrace_line = caller.find { |line| !line.include?('lib/rspec/core') }
+              backtrace_line = CallerFilter.first_non_rspec_line
+
               RSpec.warn_deprecation <<-WARNING.gsub(/^ /, '')
                 Accessing shared_examples defined across contexts is deprecated.
                 Please declare shared_examples within a shared context, or at the top level.
                 This message was generated at: #{backtrace_line}
               WARNING
+
               example
             end
           end

data/lib/rspec/core/version.rb

@@ -1,8 +1,7 @@
 module RSpec
   module Core
     module Version
-      STRING = '2.14.8'
+      STRING = '2.99.0.beta1'
     end
   end
 end
-

data/spec/command_line/order_spec.rb

@@ -130,11 +130,11 @@ describe 'command line', :ui do
     end
   end
 
-  describe '--order default on CLI with --order rand in .rspec' do
-    it "overrides --order rand with --order default" do
+  describe '--order defined on CLI with --order rand in .rspec' do
+    it "overrides --order rand with --order defined" do
       write_file '.rspec', '--order rand'
 
-      run_command 'tmp/aruba/spec/order_spec.rb --order default -f doc'
+      run_command 'tmp/aruba/spec/order_spec.rb --order defined -f doc'
 
       expect(stdout.string).not_to match(/Randomized/)
 
@@ -148,7 +148,7 @@ describe 'command line', :ui do
     before do
       write_file 'spec/custom_order_spec.rb', """
         RSpec.configure do |config|
-          config.order_groups_and_examples do |list|
+          config.register_ordering(:global) do |list|
             list.sort_by { |item| item.description }
           end
         end

data/spec/rspec/core/backtrace_cleaner_spec.rb

@@ -6,55 +6,55 @@ module RSpec::Core
       it "keeps all lines" do
         lines = ["/tmp/a_file", "some_random_text", "hello\330\271!"]
         cleaner = BacktraceCleaner.new([], [])
-        expect(lines.all? {|line| cleaner.exclude? line}).to be_false
+        expect(lines.all? {|line| cleaner.exclude? line}).to be_falsey
       end
 
       it 'is considered a full backtrace' do
-        expect(BacktraceCleaner.new([], []).full_backtrace?).to be_true
+        expect(BacktraceCleaner.new([], []).full_backtrace?).to be_truthy
       end
     end
 
     context "with an exclusion pattern but no inclusion patterns" do
       it "excludes lines that match the exclusion pattern" do
         cleaner = BacktraceCleaner.new([], [/remove/])
-        expect(cleaner.exclude? "remove me").to be_true
+        expect(cleaner.exclude? "remove me").to be_truthy
       end
 
       it "keeps lines that do not match the exclusion pattern" do
         cleaner = BacktraceCleaner.new([], [/remove/])
-        expect(cleaner.exclude? "apple").to be_false
+        expect(cleaner.exclude? "apple").to be_falsey
       end
 
       it 'is considered a partial backtrace' do
-        expect(BacktraceCleaner.new([], [/remove/]).full_backtrace?).to be_false
+        expect(BacktraceCleaner.new([], [/remove/]).full_backtrace?).to be_falsey
       end
     end
 
     context "with an exclusion pattern and an inclusion pattern" do
       it "excludes lines that match the exclusion pattern but not the inclusion pattern" do
         cleaner = BacktraceCleaner.new([/keep/], [/discard/])
-        expect(cleaner.exclude? "discard").to be_true
+        expect(cleaner.exclude? "discard").to be_truthy
       end
 
       it "keeps lines that match the inclusion pattern and the exclusion pattern" do
         cleaner = BacktraceCleaner.new([/hi/], [/.*/])
-        expect(cleaner.exclude? "hi").to be_false
+        expect(cleaner.exclude? "hi").to be_falsey
       end
 
       it "keeps lines that match neither pattern" do
         cleaner = BacktraceCleaner.new([/hi/], [/delete/])
-        expect(cleaner.exclude? "fish").to be_false
+        expect(cleaner.exclude? "fish").to be_falsey
       end
 
       it 'is considered a partial backtrace' do
-        expect(BacktraceCleaner.new([], [/remove/]).full_backtrace?).to be_false
+        expect(BacktraceCleaner.new([], [/remove/]).full_backtrace?).to be_falsey
       end
     end
 
     context "with an exclusion pattern that matches the current working directory" do
       it "defaults to having one inclusion pattern, the current working directory" do
         cleaner = BacktraceCleaner.new(nil, [/.*/])
-        expect(Dir.getwd =~ cleaner.inclusion_patterns.first).to be_true
+        expect(Dir.getwd =~ cleaner.inclusion_patterns.first).to be_truthy
       end
     end