Update caller filter once more...

rspec · Aug 26, 2013 · f3d70e1 · f3d70e1
1 parent 693f9c9
commit f3d70e1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/lib/rspec/mocks/caller_filter.rb b/lib/rspec/mocks/caller_filter.rb
@@ -13,7 +13,7 @@ class CallerFilter
       rails
     ]
 
-    ADDITIONAL_TOP_LEVEL_FILES = %w[ autorun caller_filter ]
+    ADDITIONAL_TOP_LEVEL_FILES = %w[ autorun ]
 
     LIB_REGEX = %r{/lib/rspec/(#{(RSPEC_LIBS + ADDITIONAL_TOP_LEVEL_FILES).join('|')})(\.rb|/)}
 

diff --git a/spec/rspec/mocks_spec.rb b/spec/rspec/mocks_spec.rb
@@ -64,10 +64,8 @@ def file_contents_for(lib, filename)
   end
 
   it 'has an up-to-date rspec/caller_filter file' do
-    pending "Holding off on this spec for now while this settles"
-
-    mocks = file_contents_for("mocks", "rspec/caller_filter.rb")
-    core  = file_contents_for("core",  "rspec/caller_filter.rb")
+    mocks = file_contents_for("mocks", "rspec/mocks/caller_filter.rb")
+    core  = file_contents_for("core",  "rspec/core/caller_filter.rb")
 
     expect(mocks).to eq(core)
   end