moto 0.0.22 → 0.0.23

data/lib/runner_logging.rb

@@ -1,27 +1,27 @@
-module Moto
-  module RunnerLogging
-
-
-    # TODO: merge it somehow with TestLogging. Parametrize logger object?
-    def self.included(cls)
-      def cls.method_added(name)
-        excluded_methods = Moto::EmptyListener.instance_methods(false)
-        excluded_methods << :new
-        excluded_methods << :initialize
-        # TODO: configure more excluded classes/methods
-        return if @added 
-        @added = true # protect from recursion
-        original_method = "original_#{name}"
-        alias_method original_method, name
-        define_method(name) do |*args|
-          @context.runner.logger.debug("#{self.class.name}::#{__callee__} ENTER >>> #{args}") unless excluded_methods.include? name 
-          result = send original_method, *args
-          @context.runner.logger.debug("#{self.class.name}::#{__callee__} LEAVE <<< #{result} ") unless excluded_methods.include? name
-          result
-        end
-        @added = false
-      end
-
-    end    
-  end
+module Moto
+  module RunnerLogging
+
+
+    # TODO: merge it somehow with TestLogging. Parametrize logger object?
+    def self.included(cls)
+      def cls.method_added(name)
+        excluded_methods = Moto::EmptyListener.instance_methods(false)
+        excluded_methods << :new
+        excluded_methods << :initialize
+        # TODO: configure more excluded classes/methods
+        return if @added 
+        @added = true # protect from recursion
+        original_method = "original_#{name}"
+        alias_method original_method, name
+        define_method(name) do |*args|
+          @context.runner.logger.debug("#{self.class.name}::#{__callee__} ENTER >>> #{args}") unless excluded_methods.include? name 
+          result = send original_method, *args
+          @context.runner.logger.debug("#{self.class.name}::#{__callee__} LEAVE <<< #{result} ") unless excluded_methods.include? name
+          result
+        end
+        @added = false
+      end
+
+    end    
+  end
 end

data/lib/test_logging.rb

@@ -1,49 +1,49 @@
-module Moto
-  module TestLogging
-
-    @@ignore_logging = []
-
-    def self.included(cls)
-
-      def cls.ignore_logging(method)
-        full_name = "#{self.name}::#{method}"
-        @@ignore_logging << full_name
-      end
-      
-      def cls.method_added(name)
-
-        Moto::EmptyListener.instance_methods(false).each do |m|
-          full_name = "#{self.name}::#{m}"
-          @@ignore_logging << full_name unless @@ignore_logging.include? full_name
-        end
-        @@ignore_logging << "#{self.name}::new"
-        @@ignore_logging << "#{self.name}::initialize"
-
-        return if @added 
-        @added = true # protect from recursion
-        original_method = "original_#{name}"
-        alias_method original_method, name
-        define_method(name) do |*args|
-          full_name = "#{self.class.name}::#{__callee__}"
-          # TODO: use self.class.ancestors to figure out if ancestor::__callee__ is not in @@ignore_logging
-          skip_logging = @@ignore_logging.include? full_name
-          unless skip_logging
-            self.class.ancestors.each do |a|
-              ancestor_name = "#{a.name}::#{__callee__}"
-              if @@ignore_logging.include? ancestor_name
-                skip_logging = true
-                break
-              end
-            end
-          end
-          @context.current_test.logger.debug("ENTER >>> #{self.class.name}::#{__callee__}(#{args})") unless skip_logging 
-          result = send original_method, *args
-          @context.current_test.logger.debug("LEAVE <<< #{self.class.name}::#{__callee__} => #{result} ") unless skip_logging
-          result
-        end
-        @added = false
-      end
-    end    
-
-  end
+module Moto
+  module TestLogging
+
+    @@ignore_logging = []
+
+    def self.included(cls)
+
+      def cls.ignore_logging(method)
+        full_name = "#{self.name}::#{method}"
+        @@ignore_logging << full_name
+      end
+      
+      def cls.method_added(name)
+
+        Moto::EmptyListener.instance_methods(false).each do |m|
+          full_name = "#{self.name}::#{m}"
+          @@ignore_logging << full_name unless @@ignore_logging.include? full_name
+        end
+        @@ignore_logging << "#{self.name}::new"
+        @@ignore_logging << "#{self.name}::initialize"
+
+        return if @added 
+        @added = true # protect from recursion
+        original_method = "original_#{name}"
+        alias_method original_method, name
+        define_method(name) do |*args|
+          full_name = "#{self.class.name}::#{__callee__}"
+          # TODO: use self.class.ancestors to figure out if ancestor::__callee__ is not in @@ignore_logging
+          skip_logging = @@ignore_logging.include? full_name
+          unless skip_logging
+            self.class.ancestors.each do |a|
+              ancestor_name = "#{a.name}::#{__callee__}"
+              if @@ignore_logging.include? ancestor_name
+                skip_logging = true
+                break
+              end
+            end
+          end
+          @context.current_test.logger.debug("ENTER >>> #{self.class.name}::#{__callee__}(#{args})") unless skip_logging 
+          result = send original_method, *args
+          @context.current_test.logger.debug("LEAVE <<< #{self.class.name}::#{__callee__} => #{result} ") unless skip_logging
+          result
+        end
+        @added = false
+      end
+    end    
+
+  end
 end

data/lib/thread_context.rb

@@ -76,15 +76,21 @@ module Moto
     end
 
     def run
-      # remove log files from previous execution
-      Dir.glob("#{@test.dir}/*.log").each {|f| File.delete f }
+      # remove log/screenshot files from previous execution
+      Dir.glob("#{@test.dir}/*.{log,png}").each {|f| File.delete f }
       max_attempts = @runner.my_config[:max_attempts] || 1
       sleep_time = @runner.my_config[:sleep_before_attempt] || 0
       @runner.environments.each do |env|
-        params_path = "#{@test.dir}/#{@test.filename}.yml"
         params_all = [{}]
-        params_all = YAML.load(ERB.new(File.read(params_path)).result) if File.exists?(params_path)
-        #params_all = YAML.load_file(params_path) if File.exists?(params_path)
+
+        # YAML config files
+        #params_path = "#{@test.dir}/#{@test.filename}_params.yml"
+        #params_all = YAML.load(ERB.new(File.read(params_path)).result) if File.exists?(params_path)
+
+        # RB Config files
+        params_path = "#{@test.dir}/#{@test.filename}"
+        params_all = eval(File.read(params_path)) if File.exists?(params_path)
+
         params_all.each_with_index do |params, params_index|
           # Filtering out param sets that are specific to certain envs
           unless params['__env'].nil?
@@ -110,6 +116,7 @@ module Moto
             rescue Exception => e
               @logger.error("#{e.class.name}: #{e.message}")
               @logger.error(e.backtrace.join("\n"))
+              @clients.each_value { |c| c.handle_test_exception(@test, e) }
               @runner.result.add_error(@test, e)
             end
             @test.after
@@ -120,7 +127,7 @@ module Moto
             @logger.close
             @runner.listeners[1..-1].each { |l| l.end_test(@test) }
             break unless [Result::FAILURE, Result::ERROR].include? @test.result
-            sleep sleep_time if max_attempts > 1
+            sleep sleep_time unless attempt.equal? max_attempts
           end # RETRY
         end
       end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Moto
-  VERSION = '0.0.22'
+  VERSION = '0.0.23'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moto
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.23
 platform: ruby
 authors:
 - Bartek Wilczek
@@ -10,62 +10,62 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-27 00:00:00.000000000 Z
+date: 2016-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sys-uname
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: This is a development version of a rails philosophy inspired framework
@@ -81,12 +81,24 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/moto
 - lib/app_generator.rb
 - lib/assert.rb
 - lib/cli.rb
+- lib/clients/base.rb
+- lib/clients/website.rb
 - lib/empty_listener.rb
+- lib/exceptions/moto.rb
+- lib/exceptions/test_forced_failure.rb
+- lib/exceptions/test_forced_passed.rb
+- lib/exceptions/test_skipped.rb
 - lib/forward_context_methods.rb
 - lib/initializer.rb
+- lib/listeners/base.rb
+- lib/listeners/console.rb
+- lib/listeners/console_dots.rb
+- lib/listeners/junit_xml.rb
+- lib/listeners/webui.rb
 - lib/page.rb
 - lib/parser.rb
 - lib/result.rb
@@ -98,18 +110,6 @@ files:
 - lib/thread_context.rb
 - lib/thread_pool.rb
 - lib/version.rb
-- lib/clients/base.rb
-- lib/clients/website.rb
-- lib/exceptions/moto.rb
-- lib/exceptions/test_forced_failure.rb
-- lib/exceptions/test_forced_passed.rb
-- lib/exceptions/test_skipped.rb
-- lib/listeners/base.rb
-- lib/listeners/console.rb
-- lib/listeners/console_dots.rb
-- lib/listeners/junit_xml.rb
-- lib/listeners/webui.rb
-- bin/moto
 homepage: https://github.com/bwilczek/moto
 licenses:
 - MIT
@@ -120,17 +120,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ~>
+  - - "~>"
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: Moto - yet another web testing framework