lopata 0.1.13 → 0.1.17

data/lib/lopata/shared_step.rb

@@ -1,39 +1,39 @@
-module Lopata
-  # @private
-  class SharedStep
-    attr_reader :name, :block
-
-    class NotFound < StandardError; end
-
-
-    def self.register(name, &block)
-      raise ArgumentError, "Comma is not allowed in shared step name: '%s'" % name if name =~ /,/
-      registry[name] = new(name, &block)
-    end
-
-    def self.find(name)
-      registry[name] or raise NotFound, "Shared step '%s' not found" % name
-    end
-
-    def initialize(name, &block)
-      @name, @block = name, block
-    end
-
-    def steps
-      @steps ||= build_steps
-    end
-
-    def build_steps
-      builder = Lopata::ScenarioBuilder.new(name)
-      builder.shared_step = self
-      builder.instance_exec(&block)
-      builder.steps
-    end
-
-    private
-
-    def self.registry
-      @shared_steps ||= {}
-    end
-  end
+module Lopata
+  # @private
+  class SharedStep
+    attr_reader :name, :block
+
+    class NotFound < StandardError; end
+
+
+    def self.register(name, &block)
+      raise ArgumentError, "Comma is not allowed in shared step name: '%s'" % name if name =~ /,/
+      registry[name] = new(name, &block)
+    end
+
+    def self.find(name)
+      registry[name] or raise NotFound, "Shared step '%s' not found" % name
+    end
+
+    def initialize(name, &block)
+      @name, @block = name, block
+    end
+
+    def steps
+      @steps ||= build_steps
+    end
+
+    def build_steps
+      builder = Lopata::ScenarioBuilder.new(name)
+      builder.shared_step = self
+      builder.instance_exec(&block)
+      builder.steps
+    end
+
+    private
+
+    def self.registry
+      @shared_steps ||= {}
+    end
+  end
 end

data/lib/lopata/step.rb

@@ -1,191 +1,191 @@
-require 'forwardable'
-
-module Lopata
-  # @private
-  class Step
-    attr_reader :block, :args, :condition, :method_name, :shared_step
-    # metadata overrien by the step.
-    attr_accessor :metadata
-
-    def initialize(method_name, *args, condition: nil, shared_step: nil, &block)
-      @method_name = method_name
-      @args = args
-      @block = block
-      @shared_step = shared_step
-      @condition = condition
-      initialized! if defined? initialized!
-    end
-
-    def title
-      base_title = args.first
-      base_title ||= shared_step && "#{method_name.capitalize} #{shared_step.name}" || "Untitled #{method_name}"
-      base_title
-    end
-
-    def execution_steps(scenario, groups: [])
-      return [] if condition && !condition.match?(scenario)
-      return [] unless block
-      [StepExecution.new(self, groups, &block)]
-    end
-  end
-
-  # @private
-  # Used for action, setup, teardown, verify
-  class ActionStep < Step
-    def execution_steps(scenario, groups: [])
-      steps = []
-      return steps if condition && !condition.match?(scenario)
-      convert_args(scenario).each do |step|
-        if step.is_a?(String)
-          Lopata::SharedStep.find(step).steps.each do |shared_step|
-            next if shared_step.condition && !shared_step.condition.match?(scenario)
-            steps += shared_step.execution_steps(scenario, groups: groups)
-          end
-        elsif step.is_a?(Proc)
-          steps << StepExecution.new(self, groups, &step)
-        end
-      end
-      steps << StepExecution.new(self, groups, &block) if block
-      steps.reject { |s| !s.block }
-    end
-
-    def separate_args(args)
-      args.map { |a| a.is_a?(String) && a =~ /,/ ? a.split(',').map(&:strip) : a }.flatten
-    end
-
-    def convert_args(scenario)
-      flat_args = separate_args(args.flatten)
-      flat_args.map do |arg|
-        case arg
-          # trait symbols as link to metadata.
-          when Symbol then scenario.metadata[arg]
-        else
-          arg
-        end
-      end.flatten
-    end
-
-    def title
-      shared_step && "#{method_name.capitalize} #{shared_step.name}" || "Untitled #{method_name}"
-    end
-  end
-
-  # @private
-  # Used for context
-  class GroupStep < Step
-
-    def execution_steps(scenario, groups: [])
-      steps = []
-      return steps if condition && !condition.match?(scenario)
-      @steps.each do |step|
-        steps += step.execution_steps(scenario, groups: groups + [self])
-      end
-      steps.reject! { |s| !s.block }
-      steps.reject { |s| s.teardown_group?(self) } + steps.select { |s| s.teardown_group?(self) }
-    end
-
-    def let_methods
-      @let_methods ||= {}
-    end
-
-    private
-
-    # Group step's block is a block in context of builder, not scenario. So hide the @block to not be used in scenario.
-    def initialized!
-      builder = Lopata::ScenarioBuilder.new(title)
-      builder.instance_exec(&@block)
-      @steps = builder.steps
-      @block = nil
-    end
-  end
-
-  #@private
-  class StepExecution
-    attr_reader :step, :status, :exception, :block, :pending_message, :groups
-    extend Forwardable
-    def_delegators :step, :method_name
-
-    class PendingStepFixedError < StandardError; end
-
-    def initialize(step, groups, &block)
-      @step = step
-      @status = :not_runned
-      @exception = nil
-      @block = block
-      @groups = groups
-    end
-
-    def title
-      group_title = groups.map { |g| "#{g.title}: " }.join
-      "#{group_title}#{step.title}"
-    end
-
-    def run(scenario)
-      @status = :running
-      begin
-        run_step(scenario)
-        if pending?
-          @status = :failed
-          raise PendingStepFixedError, 'Expected step to fail since it is pending, but it passed.'
-        else
-          @status = :passed
-        end
-      rescue Exception => e
-        @status = :failed unless pending?
-        @exception = e
-      end
-    end
-
-    def run_step(scenario)
-      return unless block
-      scenario.instance_exec(&block)
-    end
-
-    def failed?
-      status == :failed
-    end
-
-    def passed?
-      status == :passed
-    end
-
-    def skipped?
-      status == :skipped
-    end
-
-    def skip!
-      @status = :skipped
-    end
-
-    def pending?
-      status == :pending
-    end
-
-    def pending!(message = nil)
-      @status = :pending
-      @pending_message = message
-    end
-
-    def teardown?
-      %i{ teardown cleanup }.include?(method_name)
-    end
-
-    def teardown_group?(group = nil)
-      teardown? && self.groups.last == group
-    end
-
-    def skip_rest_on_failure?
-      %i{ setup action }.include?(method_name)
-    end
-
-    # Step metadata is a combination of metadata given for step and all contexts (groups) the step included
-    def metadata
-      (groups + [step]).compact.inject({}) { |merged, part| merged.merge(part.metadata) }
-    end
-
-    # Step methods is a combination of let_methods for all contexts (group) the step included
-    def let_methods
-      (groups).compact.inject({}) { |merged, part| merged.merge(part.let_methods) }
-    end
-  end
-end
+require 'forwardable'
+
+module Lopata
+  # @private
+  class Step
+    attr_reader :block, :args, :condition, :method_name, :shared_step
+    # metadata overrien by the step.
+    attr_accessor :metadata
+
+    def initialize(method_name, *args, condition: nil, shared_step: nil, &block)
+      @method_name = method_name
+      @args = args
+      @block = block
+      @shared_step = shared_step
+      @condition = condition
+      initialized! if defined? initialized!
+    end
+
+    def title
+      base_title = args.first
+      base_title ||= shared_step && "#{method_name.capitalize} #{shared_step.name}" || "Untitled #{method_name}"
+      base_title
+    end
+
+    def execution_steps(scenario, groups: [])
+      return [] if condition && !condition.match?(scenario)
+      return [] unless block
+      [StepExecution.new(self, groups, &block)]
+    end
+  end
+
+  # @private
+  # Used for action, setup, teardown, verify
+  class ActionStep < Step
+    def execution_steps(scenario, groups: [])
+      steps = []
+      return steps if condition && !condition.match?(scenario)
+      convert_args(scenario).each do |step|
+        if step.is_a?(String)
+          Lopata::SharedStep.find(step).steps.each do |shared_step|
+            next if shared_step.condition && !shared_step.condition.match?(scenario)
+            steps += shared_step.execution_steps(scenario, groups: groups)
+          end
+        elsif step.is_a?(Proc)
+          steps << StepExecution.new(self, groups, &step)
+        end
+      end
+      steps << StepExecution.new(self, groups, &block) if block
+      steps.reject { |s| !s.block }
+    end
+
+    def separate_args(args)
+      args.map { |a| a.is_a?(String) && a =~ /,/ ? a.split(',').map(&:strip) : a }.flatten
+    end
+
+    def convert_args(scenario)
+      flat_args = separate_args(args.flatten)
+      flat_args.map do |arg|
+        case arg
+          # trait symbols as link to metadata.
+          when Symbol then scenario.metadata[arg]
+        else
+          arg
+        end
+      end.flatten
+    end
+
+    def title
+      shared_step && "#{method_name.capitalize} #{shared_step.name}" || "Untitled #{method_name}"
+    end
+  end
+
+  # @private
+  # Used for context
+  class GroupStep < Step
+
+    def execution_steps(scenario, groups: [])
+      steps = []
+      return steps if condition && !condition.match?(scenario)
+      @steps.each do |step|
+        steps += step.execution_steps(scenario, groups: groups + [self])
+      end
+      steps.reject! { |s| !s.block }
+      steps.reject { |s| s.teardown_group?(self) } + steps.select { |s| s.teardown_group?(self) }
+    end
+
+    def let_methods
+      @let_methods ||= {}
+    end
+
+    private
+
+    # Group step's block is a block in context of builder, not scenario. So hide the @block to not be used in scenario.
+    def initialized!
+      builder = Lopata::ScenarioBuilder.new(title)
+      builder.instance_exec(&@block)
+      @steps = builder.steps
+      @block = nil
+    end
+  end
+
+  #@private
+  class StepExecution
+    attr_reader :step, :status, :exception, :block, :pending_message, :groups
+    extend Forwardable
+    def_delegators :step, :method_name
+
+    class PendingStepFixedError < StandardError; end
+
+    def initialize(step, groups, &block)
+      @step = step
+      @status = :not_runned
+      @exception = nil
+      @block = block
+      @groups = groups
+    end
+
+    def title
+      group_title = groups.map { |g| "#{g.title}: " }.join
+      "#{group_title}#{step.title}"
+    end
+
+    def run(scenario)
+      @status = :running
+      begin
+        run_step(scenario)
+        if pending?
+          @status = :failed
+          raise PendingStepFixedError, 'Expected step to fail since it is pending, but it passed.'
+        else
+          @status = :passed
+        end
+      rescue Exception => e
+        @status = :failed unless pending?
+        @exception = e
+      end
+    end
+
+    def run_step(scenario)
+      return unless block
+      scenario.instance_exec(&block)
+    end
+
+    def failed?
+      status == :failed
+    end
+
+    def passed?
+      status == :passed
+    end
+
+    def skipped?
+      status == :skipped
+    end
+
+    def skip!
+      @status = :skipped
+    end
+
+    def pending?
+      status == :pending
+    end
+
+    def pending!(message = nil)
+      @status = :pending
+      @pending_message = message
+    end
+
+    def teardown?
+      %i{ teardown cleanup }.include?(method_name)
+    end
+
+    def teardown_group?(group = nil)
+      teardown? && self.groups.last == group
+    end
+
+    def skip_rest_on_failure?
+      %i{ setup action }.include?(method_name)
+    end
+
+    # Step metadata is a combination of metadata given for step and all contexts (groups) the step included
+    def metadata
+      (groups + [step]).compact.inject({}) { |merged, part| merged.merge(part.metadata) }
+    end
+
+    # Step methods is a combination of let_methods for all contexts (group) the step included
+    def let_methods
+      (groups).compact.inject({}) { |merged, part| merged.merge(part.let_methods) }
+    end
+  end
+end

data/lib/lopata/version.rb

@@ -1,6 +1,6 @@
-module Lopata
-  # @private
-  module Version
-    STRING = '0.1.13'
-  end
-end
+module Lopata
+  # @private
+  module Version
+    STRING = '0.1.17'
+  end
+end

data/lib/lopata/world.rb

@@ -1,25 +1,25 @@
-# Container for gobal non-configuration data
-class Lopata::World
-  # Scenarios are selected for current run
-  # @return [Array<Lopata::Scenario::Execution>]
-  attr_reader :scenarios
-
-  # @private
-  def initialize
-    @scenarios = []
-  end
-
-  # @private
-  def notify_observers(event, context)
-    observers.each do |observer|
-      observer.send event, context
-    end
-  end
-
-  private
-
-  # Define observers based on configuration
-  def observers
-    Lopata.configuration.observers
-  end
+# Container for gobal non-configuration data
+class Lopata::World
+  # Scenarios are selected for current run
+  # @return [Array<Lopata::Scenario::Execution>]
+  attr_reader :scenarios
+
+  # @private
+  def initialize
+    @scenarios = []
+  end
+
+  # @private
+  def notify_observers(event, context)
+    observers.each do |observer|
+      observer.send event, context
+    end
+  end
+
+  private
+
+  # Define observers based on configuration
+  def observers
+    Lopata.configuration.observers
+  end
 end