rspec-core 2.99.2 → 3.0.0.beta1

data/lib/rspec/core/reporter.rb

@@ -2,9 +2,10 @@ module RSpec::Core
   class Reporter
     NOTIFICATIONS = %W[start message example_group_started example_group_finished example_started
                        example_passed example_failed example_pending start_dump dump_pending
-                       dump_failures dump_summary seed close stop deprecation deprecation_summary].map { |n| n.to_sym }
+                       dump_failures dump_summary seed close stop deprecation deprecation_summary].map(&:to_sym)
 
-    def initialize(*formatters)
+    def initialize(configuration, *formatters)
+      @configuration = configuration
       @listeners = Hash.new { |h,k| h[k] = [] }
       formatters.each do |formatter|
         register_listener(formatter, *NOTIFICATIONS)
@@ -32,32 +33,26 @@ module RSpec::Core
 
     # @api
     # @overload report(count, &block)
-    # @overload report(count, seed, &block)
+    # @overload report(count, &block)
     # @param [Integer] count the number of examples being run
-    # @param [Integer] seed the seed used to randomize the spec run
     # @param [Block] block yields itself for further reporting.
     #
     # Initializes the report run and yields itself for further reporting. The
     # block is required, so that the reporter can manage cleaning up after the
     # run.
     #
-    # ### Warning:
-    #
-    # The `seed` argument is an internal API and is not guaranteed to be
-    # supported in the future.
-    #
     # @example
     #
     #     reporter.report(group.examples.size) do |r|
     #       example_groups.map {|g| g.run(r) }
     #     end
     #
-    def report(expected_example_count, seed=nil)
+    def report(expected_example_count)
       start(expected_example_count)
       begin
         yield self
       ensure
-        finish(seed)
+        finish
       end
     end
 
@@ -101,24 +96,21 @@ module RSpec::Core
       notify :deprecation, message
     end
 
-    def finish(seed)
+    def finish
       begin
         stop
         notify :start_dump
         notify :dump_pending
         notify :dump_failures
-        notify :deprecation_summary
         notify :dump_summary, @duration, @example_count, @failure_count, @pending_count
-        notify :seed, seed if seed
+        notify :deprecation_summary
+        notify :seed, @configuration.seed if seed_used?
       ensure
         notify :close
       end
     end
 
-    def abort(seed)
-      RSpec.deprecate "RSpec::Core::Reporter#abort", :replacement => "RSpec::Core::Reporter#finish"
-      finish(seed)
-    end
+    alias_method :abort, :finish
 
     def stop
       @duration = (RSpec::Core::Time.now - @start).to_f if @start
@@ -131,5 +123,10 @@ module RSpec::Core
       end
     end
 
+  private
+
+    def seed_used?
+      @configuration.seed && @configuration.seed_used?
+    end
   end
 end

data/lib/rspec/core/runner.rb

@@ -34,9 +34,19 @@ module RSpec
       end
 
       def self.running_in_drb?
-        defined?(DRb) &&
-        (DRb.current_server rescue false) &&
-         DRb.current_server.uri =~ /druby\:\/\/127.0.0.1\:/
+        begin
+          if defined?(DRb) && DRb.current_server
+            require 'socket'
+            require 'uri'
+
+            local_ipv4 = IPSocket.getaddress(Socket.gethostname)
+
+            local_drb = ["127.0.0.1", "localhost", local_ipv4].any? { |addr| addr == URI(DRb.current_server.uri).host }
+          end
+        rescue DRb::DRbServerNotFound
+        ensure
+          return local_drb || false
+        end
       end
 
       def self.trap_interrupt
@@ -47,18 +57,6 @@ module RSpec
         end
       end
 
-
-      # @private
-      # Warns that RSpec 3.0.0 will no longer call reset for users
-      def self.warn_about_calling_reset
-        RSpec.configuration.deprecation_stream.puts(<<-EOD)
-Calling `RSpec::Core::Runner.run` will no longer implicitly invoke
-`RSpec.reset` as of RSpec 3.0.0. If you need RSpec to be reset between your
-calls to `RSpec::Core::Runner.run` please invoke `RSpec.reset` manually in the
-appropriate place.
-        EOD
-      end
-
       # Run a suite of RSpec examples.
       #
       # This is used internally by RSpec to run a suite, but is available
@@ -76,36 +74,24 @@ appropriate place.
       # #### Returns
       # * +Fixnum+ - exit status code (0/1)
       def self.run(args, err=$stderr, out=$stdout)
-        warn_about_calling_reset if RSpec.resets_required > 0
-        RSpec.resets_required += 1
         trap_interrupt
         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
             DRbCommandLine.new(options).run(err, out)
           rescue DRb::DRbConnError
             err.puts "No DRb server is running. Running in local process instead ..."
-            new(options).run(err, out)
+            CommandLine.new(options).run(err, out)
           end
         else
-          new(options).run(err, out)
+          CommandLine.new(options).run(err, out)
         end
       ensure
-        RSpec.internal_reset
+        RSpec.reset
       end
     end
-
   end
 end

data/lib/rspec/core/shared_context.rb

@@ -38,11 +38,9 @@ module RSpec
       # @api private
       def self.record(methods)
         methods.each do |meth|
-          class_eval <<-EOS, __FILE__, __LINE__ + 1
-            def #{meth}(*args, &block)
-              __shared_context_recordings << Recording.new(:#{meth}, args, block)
-            end
-          EOS
+          define_method(meth) do |*args, &block|
+            __shared_context_recordings << Recording.new(meth, args, block)
+          end
         end
       end
 

data/lib/rspec/core/shared_example_group.rb

@@ -33,20 +33,9 @@ module RSpec
       end
 
       alias_method :shared_context,      :shared_examples
+      alias_method :share_examples_for,  :shared_examples
       alias_method :shared_examples_for, :shared_examples
 
-      def share_examples_for(*args, &block)
-        RSpec.deprecate("`share_examples_for`", :replacement => "`shared_examples` or `shared_examples_for`")
-        shared_examples(*args, &block)
-      end
-
-      # @deprecated
-      def share_as(name, &block)
-        RSpec.deprecate("Rspec::Core::SharedExampleGroup#share_as",
-                        :replacement => "RSpec::SharedContext or shared_examples")
-        SharedExampleGroup.registry.add_const(self, name, &block)
-      end
-
       def shared_example_groups
         SharedExampleGroup.registry.shared_example_groups_for('main', *ancestors[0..-1])
       end
@@ -57,18 +46,9 @@ module RSpec
         end
 
         alias_method :shared_context,      :shared_examples
+        alias_method :share_examples_for,  :shared_examples
         alias_method :shared_examples_for, :shared_examples
 
-        def share_examples_for(*args, &block)
-          RSpec.deprecate("`share_examples_for`", :replacement => "`shared_examples` or `shared_examples_for`")
-          shared_examples(*args, &block)
-        end
-
-        def share_as(name, &block)
-          RSpec.deprecate("`share_as`", :replacement => "`RSpec::SharedContext` or `shared_examples`")
-          SharedExampleGroup.registry.add_const('main', name, &block)
-        end
-
         def shared_example_groups
           SharedExampleGroup.registry.shared_example_groups_for('main')
         end
@@ -104,30 +84,6 @@ module RSpec
           end
         end
 
-        def add_const(source, name, &block)
-          if Object.const_defined?(name)
-            mod = Object.const_get(name)
-            raise_name_error unless mod.created_from_caller(caller)
-          end
-
-          mod = Module.new do
-            @shared_block = block
-            @caller_line = caller.last
-
-            def self.created_from_caller(other_caller)
-              @caller_line == other_caller.last
-            end
-
-            def self.included(kls)
-              kls.describe(&@shared_block)
-              kls.children.first.metadata[:shared_group_name] = name
-            end
-          end
-
-          shared_const = Object.const_set(name, mod)
-          add_shared_example_group source, shared_const, block
-        end
-
         def shared_example_groups_for(*sources)
           Collection.new(sources, shared_example_groups)
         end
@@ -150,14 +106,10 @@ module RSpec
           [String, Symbol, Module].any? { |cls| cls === candidate }
         end
 
-        def raise_name_error
-          raise NameError, "The first argument (#{name}) to share_as must be a legal name for a constant not already in use."
-        end
-
         def warn_if_key_taken(source, key, new_block)
           return unless existing_block = example_block_for(source, key)
 
-          Kernel.warn <<-WARNING.gsub(/^ +\|/, '')
+          RSpec.warn_with <<-WARNING.gsub(/^ +\|/, ''), :call_site => nil
             |WARNING: Shared example group '#{key}' has been previously defined at:
             |  #{formatted_location existing_block}
             |...and you are now defining it at:

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

@@ -8,7 +8,7 @@ module RSpec
         end
 
         def [](key)
-          fetch_examples(key) || warn_deprecation_and_fetch_anyway(key)
+          fetch_examples(key)
         end
 
         private
@@ -21,24 +21,6 @@ module RSpec
             @sources.reverse.find { |source| @examples[source].has_key? key }
           end
 
-          def fetch_anyway(key)
-            @examples.values.inject({}, &:merge)[key]
-          end
-
-          def warn_deprecation_and_fetch_anyway(key)
-            if (example = fetch_anyway key)
-              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
-
       end
     end
   end

data/lib/rspec/core/version.rb

@@ -1,7 +1,7 @@
 module RSpec
   module Core
     module Version
-      STRING = '2.99.2'
+      STRING = '3.0.0.beta1'
     end
   end
 end

data/lib/rspec/core/warnings.rb

@@ -0,0 +1,22 @@
+module RSpec
+
+  # @private
+  #
+  # Used internally to print deprecation warnings
+  def self.deprecate(deprecated, data = {})
+    RSpec.configuration.reporter.deprecation(
+      {
+        :deprecated => deprecated,
+        :call_site => CallerFilter.first_non_rspec_line
+      }.merge(data)
+    )
+  end
+
+  # @private
+  #
+  # Used internally to print deprecation warnings
+  def self.warn_deprecation(message)
+    RSpec.configuration.reporter.deprecation :message => message
+  end
+
+end

data/lib/rspec/core/world.rb

@@ -9,17 +9,22 @@ module RSpec
 
       def initialize(configuration=RSpec.configuration)
         @configuration = configuration
-        @example_groups = [].extend(Extensions::Ordered::ExampleGroups)
+        @example_groups = []
         @filtered_examples = Hash.new { |hash,group|
           hash[group] = begin
             examples = group.examples.dup
             examples = filter_manager.prune(examples)
-            examples.uniq
-            examples.extend(Extensions::Ordered::Examples)
+            examples.uniq!
+            examples
           end
         }
       end
 
+      def ordered_example_groups
+        ordering_strategy = @configuration.ordering_registry.fetch(:global)
+        ordering_strategy.order(@example_groups)
+      end
+
       def reset
         example_groups.clear
         SharedExampleGroup.registry.clear
@@ -47,9 +52,8 @@ module RSpec
       end
 
       def example_count
-        example_groups.collect {|g| g.descendants}.flatten.inject(0) do |sum, g|
-          sum += g.filtered_examples.size
-        end
+        FlatMap.flat_map(example_groups) {|g| g.descendants}.
+          inject(0) {|sum, g| sum + g.filtered_examples.size}
       end
 
       def preceding_declaration_line(filter_line)
@@ -86,7 +90,7 @@ module RSpec
           example_groups.clear
           if filter_manager.empty?
             reporter.message("No examples found.")
-          elsif exclusion_filter.rules_empty?
+          elsif exclusion_filter.empty_without_conditional_filters?
             message = everything_filtered_message
             if @configuration.run_all_when_everything_filtered?
               message << "; ignoring #{inclusion_filter.description}"
@@ -109,7 +113,7 @@ module RSpec
       end
 
       def announce_exclusion_filter(announcements)
-        unless exclusion_filter.rules_empty?
+        unless exclusion_filter.empty_without_conditional_filters?
           announcements << "exclude #{exclusion_filter.description}"
         end
       end

data/spec/command_line/order_spec.rb

@@ -39,7 +39,6 @@ describe 'command line', :ui do
         specify('group 1 example 4')  {}
         specify('group 1 example 5')  {}
         specify('group 1 example 6')  {}
-        specify('group 1 example 5')  {}
         specify('group 1 example 7')  {}
         specify('group 1 example 8')  {}
         specify('group 1 example 9')  {}
@@ -81,19 +80,13 @@ describe 'command line', :ui do
     """
   end
 
-  after do
-    RSpec.resets_required = 0
-  end
-
-  before do
-    RSpec.resets_required = 0
-  end
-
   describe '--order rand' do
     it 'runs the examples and groups in a different order each time' do
-      run_command 'tmp/aruba/spec/order_spec.rb --order rand -f doc'
-      RSpec.configuration.seed = srand && srand # reset seed in same process
-      run_command 'tmp/aruba/spec/order_spec.rb --order rand -f doc'
+      run_command 'spec/order_spec.rb --order rand -f doc'
+      original_seed = srand
+      RSpec.configuration.seed = srand # reset seed in same process
+      run_command 'spec/order_spec.rb --order rand -f doc'
+      srand original_seed
 
       expect(stdout.string).to match(/Randomized with seed \d+/)
 
@@ -106,7 +99,7 @@ describe 'command line', :ui do
 
   describe '--order rand:SEED' do
     it 'runs the examples and groups in the same order each time' do
-      2.times { run_command 'tmp/aruba/spec/order_spec.rb --order rand:123 -f doc' }
+      2.times { run_command 'spec/order_spec.rb --order rand:123 -f doc' }
 
       expect(stdout.string).to match(/Randomized with seed 123/)
 
@@ -119,9 +112,9 @@ describe 'command line', :ui do
 
   describe '--seed SEED' do
     it "forces '--order rand' and runs the examples and groups in the same order each time" do
-      2.times { run_command 'tmp/aruba/spec/order_spec.rb --seed 123 -f doc' }
+      2.times { run_command 'spec/order_spec.rb --seed 123 -f doc' }
 
-      expect(stdout.string).to match(/Randomized with seed \d+/)
+      expect(stdout.string).to match(/Randomized with seed 123/)
 
       top_level_groups      {|first_run, second_run| expect(first_run).to eq(second_run)}
       nested_groups         {|first_run, second_run| expect(first_run).to eq(second_run)}
@@ -130,8 +123,8 @@ describe 'command line', :ui do
     end
 
     it "runs examples in the same order, regardless of the order in which files are given" do
-      run_command 'tmp/aruba/spec/simple_spec.rb tmp/aruba/spec/simple_spec2.rb --seed 1337 -f doc'
-      run_command 'tmp/aruba/spec/simple_spec2.rb tmp/aruba/spec/simple_spec.rb --seed 1337 -f doc'
+      run_command 'spec/simple_spec.rb spec/simple_spec2.rb --seed 1337 -f doc'
+      run_command 'spec/simple_spec2.rb spec/simple_spec.rb --seed 1337 -f doc'
 
       top_level_groups      {|first_run, second_run| expect(first_run).to eq(second_run)}
       nested_groups         {|first_run, second_run| expect(first_run).to eq(second_run)}
@@ -139,10 +132,12 @@ describe 'command line', :ui do
   end
 
   describe '--order defined on CLI with --order rand in .rspec' do
+    after { remove_file '.rspec' }
+
     it "overrides --order rand with --order defined" do
       write_file '.rspec', '--order rand'
 
-      run_command 'tmp/aruba/spec/order_spec.rb --order defined -f doc'
+      run_command 'spec/order_spec.rb --order defined -f doc'
 
       expect(stdout.string).not_to match(/Randomized/)
 
@@ -153,10 +148,12 @@ describe 'command line', :ui do
   end
 
   context 'when a custom order is configured' do
+    after { remove_file 'spec/custom_order_spec.rb' }
+
     before do
       write_file 'spec/custom_order_spec.rb', """
         RSpec.configure do |config|
-          config.register_ordering(:global) do |list|
+          config.register_ordering :global do |list|
             list.sort_by { |item| item.description }
           end
         end
@@ -175,7 +172,7 @@ describe 'command line', :ui do
     end
 
     it 'orders the groups and examples by the provided strategy' do
-      run_command 'tmp/aruba/spec/custom_order_spec.rb -f doc'
+      run_command 'spec/custom_order_spec.rb -f doc'
 
       top_level_groups    { |groups| expect(groups.flatten).to eq(['group A', 'group B']) }
       examples('group B') do |examples|
@@ -207,8 +204,8 @@ describe 'command line', :ui do
   end
 
   def run_command(cmd)
-    RSpec::Core::Runner.run(cmd.split, stderr, stdout)
-  ensure
-    RSpec.reset
+    in_current_dir do
+      RSpec::Core::Runner.run(cmd.split, stderr, stdout)
+    end
   end
 end