lib/gurke/step.rb in gurke-2.4.2 vs lib/gurke/step.rb in gurke-3.0.0

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Gurke
   class Step
     #
     # Return path to file containing this scenario.
     #
@@ -18,25 +20,27 @@
     # @api private
     attr_reader :raw
 
     # @api private
     def initialize(file, line, type, raw)
-      @file, @line = file, line
-      @type, @raw  = type, raw
+      @file = file
+      @line = line
+      @type = type
+      @raw = raw
     end
 
     def name
       raw.name
     end
-    alias_method :to_s, :name
+    alias to_s name
 
     def keyword
-      raw.keyword
+      raw.keyword.strip
     end
 
     def doc_string
-      raw.doc_string.value if raw.doc_string
+      raw.doc_string&.value
     end
 
     # @api private
     #
     def run(runner, reporter, scenario, world)
@@ -53,47 +57,53 @@
 
     def run_step(runner, reporter, scenario, world)
       reporter.invoke :start_step, self, scenario
 
       result = find_and_run_step runner, scenario, world
+    rescue Interrupt
+      scenario.abort!
+      result = StepResult.new self, :aborted
+      raise
     rescue StepPending => e
       scenario.pending! e
       result = StepResult.new self, :pending, e
-    rescue Exception => e
+    rescue Exception => e # rubocop:disable RescueException
       scenario.failed! e
       result = StepResult.new self, :failed, e
     ensure
       reporter.invoke :end_step, result, scenario
     end
 
     def find_and_run_step(runner, scenario, world)
       runner.with_filtered_backtrace do
         match = Steps.find_step self, world, type
 
-        if scenario.pending? || scenario.failed?
+        if scenario.pending? || scenario.failed? || scenario.aborted?
           return StepResult.new self, :skipped
         end
 
         m = world.method match.method_name
         world.send match.method_name, *(match.params + [self])[0...m.arity]
 
-        StepResult.new self, :success
+        StepResult.new self, :passed
       end
     end
 
     #
     class StepResult
       attr_reader :step, :exception, :state
 
       def initialize(step, state, err = nil)
-        @step, @state, @exception = step, state, err
+        @step = step
+        @state = state
+        @exception = err
       end
 
       Step.public_instance_methods(false).each do |mth|
-        class_eval <<-EOS, __FILE__, __LINE__
-          def #{mth}(*args) @step.send #{mth}, *args; end
-        EOS
+        class_eval <<-RUBY, __FILE__, __LINE__ + 1
+          def #{mth}(*args) @step.send(:#{mth}, *args); end
+        RUBY
       end
 
       def failed?
         @state == :failed
       end
@@ -104,11 +114,11 @@
 
       def skipped?
         @state == :skipped
       end
 
-      def success?
-        @state == :success
+      def passed?
+        @state == :passed
       end
     end
   end
 end