rb_world.rb in cucumber-1.2.2

- old
+ new
@@ -12,80 +12,80 @@
         end
       end
 
       # Call a Transform with a string from another Transform definition
       def Transform(arg)
-        rb = @__cucumber_step_mother.load_programming_language('rb')
+        rb = @__cucumber_runtime.load_programming_language('rb')
         rb.execute_transforms([arg]).first
       end
 
-      attr_writer :__cucumber_step_mother, :__natural_language
+      attr_writer :__cucumber_runtime, :__natural_language
 
       def __cucumber_invoke(name, multiline_argument=nil) #:nodoc:
         STDERR.puts AnsiEscapes.failed + "WARNING: Using 'Given/When/Then' in step definitions is deprecated, use 'step' to call other steps instead:" + caller[0] + AnsiEscapes.reset
-        @__cucumber_step_mother.invoke(name, multiline_argument)
+        @__cucumber_runtime.invoke(name, multiline_argument)
       end
 
       # Invoke a single step.
       def step(name, multiline_argument=nil)
-        @__cucumber_step_mother.invoke(name, multiline_argument)
+        @__cucumber_runtime.invoke(name, multiline_argument)
       end
 
       # See StepMother#invoke_steps
       def steps(steps_text)
-        @__cucumber_step_mother.invoke_steps(steps_text, @__natural_language, caller[0])
+        @__cucumber_runtime.invoke_steps(steps_text, @__natural_language, caller[0])
       end
 
       # See StepMother#table
       def table(text_or_table, file=nil, line_offset=0)
-        @__cucumber_step_mother.table(text_or_table, file, line_offset)
+        @__cucumber_runtime.table(text_or_table, file, line_offset)
       end
 
       # See StepMother#doc_string
-      def doc_string(string_with_triple_quotes, file=nil, line_offset=0)
-        @__cucumber_step_mother.doc_string(string_with_triple_quotes, file, line_offset)
+      def doc_string(string_without_triple_quotes, content_type='', line_offset=0)
+        @__cucumber_runtime.doc_string(string_without_triple_quotes, content_type, line_offset)
       end
 
       def announce(*messages)
         STDERR.puts AnsiEscapes.failed + "WARNING: #announce is deprecated. Use #puts instead:" + caller[0] + AnsiEscapes.reset
         puts(*messages)
       end
 
       # See StepMother#puts
       def puts(*messages)
-        @__cucumber_step_mother.puts(*messages)
+        @__cucumber_runtime.puts(*messages)
       end
 
       # See StepMother#ask
       def ask(question, timeout_seconds=60)
-        @__cucumber_step_mother.ask(question, timeout_seconds)
+        @__cucumber_runtime.ask(question, timeout_seconds)
       end
 
       # See StepMother#embed
       def embed(file, mime_type, label='Screenshot')
-        @__cucumber_step_mother.embed(file, mime_type, label)
+        @__cucumber_runtime.embed(file, mime_type, label)
       end
 
       # Mark the matched step as pending.
       def pending(message = "TODO")
         if block_given?
           begin
             yield
-          rescue Exception => e
+          rescue Exception
             raise Pending.new(message)
           end
           raise Pending.new("Expected pending '#{message}' to fail. No Error was raised. No longer pending?")
         else
           raise Pending.new(message)
         end
       end
 
       # The default implementation of Object#inspect recursively
-      # traverses all instance variables and invokes inspect. 
+      # traverses all instance variables and invokes inspect.
       # This can be time consuming if the object graph is large.
       #
-      # This can cause unnecessary delays when certain exceptions 
-      # occur. For example, MRI internally invokes #inspect on an 
+      # This can cause unnecessary delays when certain exceptions
+      # occur. For example, MRI internally invokes #inspect on an
       # object that raises a NoMethodError. (JRuby does not do this).
       #
       # A World object can have many references created by the user
       # or frameworks (Rails), so to avoid long waiting times on
       # such errors in World we define it to just return a simple String.