Rename running_example to example to keep in sync with the rename in …

…rspec-core. - See http://github.com/rspec/rspec-core/issues/42
rspec · Jun 18, 2010 · f3de931 · f3de931
1 parent 759b953
commit f3de931
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/lib/rspec/rails/adapters.rb b/lib/rspec/rails/adapters.rb
@@ -19,8 +19,8 @@ def teardown(*methods)
 
     module TestUnitAssertionAdapter
       extend ActiveSupport::Concern
-      def method_name 
-        @running_example
+      def method_name
+        @example
       end
 
       include Test::Unit::Assertions

diff --git a/lib/rspec/rails/example/helper_example_group.rb b/lib/rspec/rails/example/helper_example_group.rb
@@ -51,7 +51,7 @@ def helper
     private
 
       def _controller_path
-        running_example.example_group.describes.to_s.sub(/Helper/,'').underscore
+        example.example_group.describes.to_s.sub(/Helper/,'').underscore
       end
     end
 

diff --git a/lib/rspec/rails/example/view_example_group.rb b/lib/rspec/rails/example/view_example_group.rb
@@ -82,7 +82,7 @@ def response
     private
 
       def _default_file_to_render
-        running_example.example_group.top_level_description
+        example.example_group.top_level_description
       end
 
       def _controller_path

diff --git a/spec/rspec/rails/example/helper_example_group_spec.rb b/spec/rspec/rails/example/helper_example_group_spec.rb
@@ -14,7 +14,7 @@ module ::FoosHelper; end
 
     it "provides a controller_path based on the helper module's name" do
       helper_spec = Object.new.extend HelperExampleGroup::InstanceMethods
-      helper_spec.stub_chain(:running_example, :example_group, :describes).and_return(FoosHelper)
+      helper_spec.stub_chain(:example, :example_group, :describes).and_return(FoosHelper)
       helper_spec.__send__(:_controller_path).should == "foos"
     end