Combine Let and Subject modules into one

exviva · Jan 4, 2013 · 0c70d63 · 0c70d63
1 parent df58558
commit 0c70d63
Show file tree

Hide file tree

Showing 8 changed files with 497 additions and 506 deletions.
diff --git a/lib/rspec/core.rb b/lib/rspec/core.rb
@@ -23,8 +23,7 @@
 
 require_rspec['core/metadata_hash_builder']
 require_rspec['core/hooks']
-require_rspec['core/subject']
-require_rspec['core/let']
+require_rspec['core/memoized_helpers']
 require_rspec['core/metadata']
 require_rspec['core/pending']
 require_rspec['core/formatters']

diff --git a/lib/rspec/core/example_group.rb b/lib/rspec/core/example_group.rb
@@ -13,15 +13,12 @@ module Core
     # which serves as a wrapper for an instance of the ExampleGroup in which it
     # is declared.
     class ExampleGroup
-      include Let # Subject::ExampleGroupMethods depends on this module, so include it first
-
       extend  MetadataHashBuilder::WithDeprecationWarning
       extend  Extensions::ModuleEvalWithArgs
-      extend  Subject::ExampleGroupMethods
       extend  Hooks
 
+      include MemoizedHelpers
       include Extensions::InstanceEvalWithArgs
-      include Subject::ExampleMethods
       include Pending
       include SharedExampleGroup
 

diff --git a/lib/rspec/core/let.rb b/lib/rspec/core/let.rb