Merge pull request rspec#2328 from TravisSpangle/master

Fix for rspec#2312

lib/rspec/core.rb

@@ -56,6 +56,7 @@ class << self
   # they use the runner multiple times within the same process. Users must deal
   # themselves with re-configuration of RSpec before run.
   def self.reset
+    RSpec::ExampleGroups.remove_all_constants
     @world = nil
     @configuration = nil
   end

lib/rspec/core/example_group.rb

@@ -827,6 +827,12 @@ def self.constant_scope_for(group)
       const_scope
     end
 
+    def self.remove_all_constants
+      constants.each do |constant|
+        __send__(:remove_const, constant)
+      end
+    end
+
     def self.base_name_for(group)
       return "Anonymous" if group.description.empty?
 

lib/rspec/core/world.rb

@@ -38,6 +38,7 @@ def ordered_example_groups
       #
       # Reset world to 'scratch' before running suite.
       def reset
+        RSpec::ExampleGroups.remove_all_constants
         example_groups.clear
         @shared_example_group_registry = nil
       end

spec/rspec/core/world_spec.rb

@@ -13,6 +13,14 @@ module RSpec::Core
         world.reset
         expect(world.example_groups).to be_empty
       end
+
+      it 'removes the previously assigned example group constants' do
+        RSpec.describe "group"
+
+        expect {
+          RSpec.world.reset
+        }.to change(RSpec::ExampleGroups, :constants).to([])
+      end
     end
 
     describe "#example_groups" do

spec/rspec/core_spec.rb

@@ -124,6 +124,14 @@
       expect(RSpec.configuration).not_to equal(config_before_reset)
       expect(RSpec.world).not_to equal(world_before_reset)
     end
+
+    it 'removes the previously assigned example group constants' do
+        RSpec.describe "group"
+
+        expect {
+          RSpec.world.reset
+        }.to change(RSpec::ExampleGroups, :constants).to([])
+    end
   end
 
   describe ".clear_examples" do