moto 0.0.29 → 0.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46635f4f7327df68be383058775c5c5c8707aee7
-  data.tar.gz: 5bbc41c516291b2218b500595b430860e2ad6ee4
+  metadata.gz: b7dd8f5b2e3a238f83d7e898e6279ec2f788ce54
+  data.tar.gz: 7ab6ef95c08fa90a159db853094efaacb06f1c01
 SHA512:
-  metadata.gz: 14c54e69cc76e246c013e75818311530b2a4a88e5bd8181833cf0a9a230af2205cef7d048cec1ebbc1a6cce04693277fa98abbea089dd2a78d021acfb34f588f
-  data.tar.gz: a37712967f69ea24f637b4c7a475d52166b7e32a0a6c0fadcd54f53c5255e8a2d1164254ff34b72666fb64fa89b21d84ee2267a7c8d15eeadd6a3007a74723b2
+  metadata.gz: b32033f7ea015858a23f4546b9e03ef1e8627c3e3639f0f240a253376cacab9e2950970e7c4441e956f206ffbba32279ba465c0a10b10ce212de47a168e9c61f
+  data.tar.gz: a5a1d760afaee024f47d736065bfbcc203846c16076a9f8333d820db042718b98c48264627ffaf2d8576db4dde3c0334949e3213fbf195bc15a2cbaca6755e69

data/bin/moto

@@ -1,5 +1,5 @@
-#!/usr/bin/env ruby
-
-require_relative '../lib/parser'
-
-Moto::Parser.run ARGV
+#!/usr/bin/env ruby
+
+require_relative '../lib/parser'
+
+Moto::Parser.run ARGV

data/lib/clients/website.rb

@@ -17,8 +17,10 @@ module Moto
 
       def start_run
         # TODO: make session driver configurable
-        context.runner.my_config[:capybara][:default_selector] &&
-            Capybara.default_selector = context.runner.my_config[:capybara][:default_selector]
+        if context.runner.my_config[:capybara][:default_selector]
+          Capybara.default_selector = context.runner.my_config[:capybara][:default_selector]
+        end
+
         Thread.current['capybara_session'] = Capybara::Session.new(context.runner.my_config[:capybara][:default_driver])
         @pages = {}
       end

data/lib/initializer.rb

@@ -1,7 +1,7 @@
-module Moto
-  class Initializer
-    def initialize(runner)
-      @runner = runner
-    end
-  end
+module Moto
+  class Initializer
+    def initialize(runner)
+      @runner = runner
+    end
+  end
 end

data/lib/listeners/webui.rb

@@ -1,71 +1,71 @@
-require 'rest-client'
-require 'sys/uname'
-
-module Moto
-  module Listeners
-    class Webui < Base
-
-      def start_run
-        # POST http://sandbox.dev:3000/api/runs/create
-        @url = @runner.my_config[:url]
-        data = {
-          name:  @runner.name,
-          result: Moto::Result::RUNNING,
-          cnt_all: nil,
-          cnt_passed: nil,
-          cnt_failure: nil,
-          cnt_error: nil,
-          cnt_skipped: nil,
-          user: Sys::Uname.sysname.downcase.include?('windows') ? ENV['USERNAME'] : ENV['LOGNAME'],
-          host: Sys::Uname.nodename,
-          pid: Process.pid
-        }
-        @run = JSON.parse( RestClient.post( "#{@url}/api/runs", data.to_json, :content_type => :json, :accept => :json ) )
-        @tests = {}
-      end
-      
-      def end_run
-        # PUT http://sandbox.dev:3000/api/runs/1
-        data = {
-          result: @runner.result.summary[:result],
-          cnt_all: @runner.result.summary[:cnt_all],
-          cnt_passed: @runner.result.summary[:cnt_passed],
-          cnt_failure: @runner.result.summary[:cnt_failure],
-          cnt_error: @runner.result.summary[:cnt_error],
-          cnt_skipped: @runner.result.summary[:cnt_skipped],
-          duration: @runner.result.summary[:duration]
-        }
-        @run = JSON.parse( RestClient.put( "#{@url}/api/runs/#{@run['id']}", data.to_json, :content_type => :json, :accept => :json ) )
-      end
-
-      def start_test(test)
-        # POST http://sandbox.dev:3000/api/tests/create
-        data = {
-          name:  test.name,
-          class_name: test.class.name,
-          log: nil,
-          run_id: @run['id'],
-          env: test.env,
-          parameters: test.params.to_s,
-          result: Moto::Result::RUNNING,
-          error: nil,
-          failures: nil,
-        }
-        @tests[test.name] = JSON.parse( RestClient.post( "#{@url}/api/tests", data.to_json, :content_type => :json, :accept => :json ) )        
-      end
-
-      def end_test(test)
-        log = File.read(test.log_path)
-        data = {
-          log: log,
-          result: @runner.result[test.name][:result],
-          error: @runner.result[test.name][:error].nil? ? nil : @runner.result[test.name][:error].message,
-          failures: @runner.result[test.name][:failures].join("\n\t"),
-          duration: @runner.result[test.name][:duration]
-        }
-        @tests[test.name] = JSON.parse( RestClient.put( "#{@url}/api/tests/#{@tests[test.name]['id']}", data.to_json, :content_type => :json, :accept => :json ) )
-      end
-
-    end
-  end
+require 'rest-client'
+require 'sys/uname'
+
+module Moto
+  module Listeners
+    class Webui < Base
+
+      def start_run
+        # POST http://sandbox.dev:3000/api/runs/create
+        @url = @runner.my_config[:url]
+        data = {
+          name:  @runner.name,
+          result: Moto::Result::RUNNING,
+          cnt_all: nil,
+          cnt_passed: nil,
+          cnt_failure: nil,
+          cnt_error: nil,
+          cnt_skipped: nil,
+          user: Sys::Uname.sysname.downcase.include?('windows') ? ENV['USERNAME'] : ENV['LOGNAME'],
+          host: Sys::Uname.nodename,
+          pid: Process.pid
+        }
+        @run = JSON.parse( RestClient.post( "#{@url}/api/runs", data.to_json, :content_type => :json, :accept => :json ) )
+        @tests = {}
+      end
+      
+      def end_run
+        # PUT http://sandbox.dev:3000/api/runs/1
+        data = {
+          result: @runner.result.summary[:result],
+          cnt_all: @runner.result.summary[:cnt_all],
+          cnt_passed: @runner.result.summary[:cnt_passed],
+          cnt_failure: @runner.result.summary[:cnt_failure],
+          cnt_error: @runner.result.summary[:cnt_error],
+          cnt_skipped: @runner.result.summary[:cnt_skipped],
+          duration: @runner.result.summary[:duration]
+        }
+        @run = JSON.parse( RestClient.put( "#{@url}/api/runs/#{@run['id']}", data.to_json, :content_type => :json, :accept => :json ) )
+      end
+
+      def start_test(test)
+        # POST http://sandbox.dev:3000/api/tests/create
+        data = {
+          name:  test.name,
+          class_name: test.class.name,
+          log: nil,
+          run_id: @run['id'],
+          env: test.env,
+          parameters: test.params.to_s,
+          result: Moto::Result::RUNNING,
+          error: nil,
+          failures: nil,
+        }
+        @tests[test.name] = JSON.parse( RestClient.post( "#{@url}/api/tests", data.to_json, :content_type => :json, :accept => :json ) )        
+      end
+
+      def end_test(test)
+        log = File.read(test.log_path)
+        data = {
+          log: log,
+          result: @runner.result[test.name][:result],
+          error: @runner.result[test.name][:error].nil? ? nil : @runner.result[test.name][:error].message,
+          failures: @runner.result[test.name][:failures].join("\n\t"),
+          duration: @runner.result[test.name][:duration]
+        }
+        @tests[test.name] = JSON.parse( RestClient.put( "#{@url}/api/tests/#{@tests[test.name]['id']}", data.to_json, :content_type => :json, :accept => :json ) )
+      end
+
+    end
+  end
 end

data/lib/result.rb

@@ -1,84 +1,84 @@
-module Moto
-  class Result
-    
-    PENDING = :pending # -2
-    RUNNING = :running # -1
-    PASSED = :passed # 0
-    FAILURE = :failure # 1
-    ERROR = :error # 2
-    SKIPPED = :skipped # 3
-
-    attr_reader :summary
-
-    def [](key)
-      @results[key]
-    end
-    
-    def all
-      @results
-    end
-    
-    def initialize(runner)
-      @runner = runner
-      @results = {}
-      @summary = {}
-    end
-    
-    def start_run
-      # start timer
-      @summary[:started_at] = Time.now.to_f
-    end
-    
-    def end_run
-      # info about duration and overall execution result
-      @summary[:finished_at] = Time.now.to_f
-      @summary[:duration] = @summary[:finished_at] - @summary[:started_at]
-      @summary[:result] = PASSED
-      @summary[:result] = FAILURE unless @results.values.select{ |v| v[:failures].count > 0 }.empty?
-      @summary[:result] = ERROR unless @results.values.select{ |v| v[:result] == ERROR }.empty?
-      @summary[:cnt_all] = @results.count
-      @summary[:tests_passed] = @results.select{ |k,v| v[:result] == PASSED }
-      @summary[:tests_failure] = @results.select{ |k,v| v[:result] == FAILURE }
-      @summary[:tests_error] = @results.select{ |k,v| v[:result] == ERROR }
-      @summary[:tests_skipped] = @results.select{ |k,v| v[:result] == SKIPPED }
-      @summary[:cnt_passed] = @summary[:tests_passed].count
-      @summary[:cnt_failure] = @summary[:tests_failure].count
-      @summary[:cnt_error] = @summary[:tests_error].count
-      @summary[:cnt_skipped] = @summary[:tests_skipped].count
-    end
-    
-    def start_test(test)
-      @results[test.name] = { class: test.class, result: RUNNING, env: test.env, params: test.params, name: test.name, error: nil, failures: [], started_at: Time.now.to_f } 
-    end
-
-    def end_test(test)
-      # calculate result basing on errors/failures
-      @results[test.name][:finished_at] = Time.now.to_f
-      test.result = PASSED
-      test.result = FAILURE unless @results[test.name][:failures].empty?
-      unless @results[test.name][:error].nil?
-        if @results[test.name][:error].is_a? Moto::Exceptions::TestSkipped
-          test.result = SKIPPED
-        elsif @results[test.name][:error].is_a? Moto::Exceptions::TestForcedPassed
-          test.result = PASSED
-        elsif @results[test.name][:error].is_a? Moto::Exceptions::TestForcedFailure
-          add_failure(test, @results[test.name][:error].message)
-          test.result = FAILURE
-        else
-          test.result = ERROR
-        end
-      end
-      @results[test.name][:duration] = @results[test.name][:finished_at] - @results[test.name][:started_at]
-      @results[test.name][:result] = test.result
-    end
-
-    def add_failure(test, msg)
-      @results[test.name][:failures] << msg
-    end
-    
-    def add_error(test, e)
-      @results[test.name][:error] = e
-    end
-    
-  end
+module Moto
+  class Result
+    
+    PENDING = :pending # -2
+    RUNNING = :running # -1
+    PASSED = :passed # 0
+    FAILURE = :failure # 1
+    ERROR = :error # 2
+    SKIPPED = :skipped # 3
+
+    attr_reader :summary
+
+    def [](key)
+      @results[key]
+    end
+    
+    def all
+      @results
+    end
+    
+    def initialize(runner)
+      @runner = runner
+      @results = {}
+      @summary = {}
+    end
+    
+    def start_run
+      # start timer
+      @summary[:started_at] = Time.now.to_f
+    end
+    
+    def end_run
+      # info about duration and overall execution result
+      @summary[:finished_at] = Time.now.to_f
+      @summary[:duration] = @summary[:finished_at] - @summary[:started_at]
+      @summary[:result] = PASSED
+      @summary[:result] = FAILURE unless @results.values.select{ |v| v[:failures].count > 0 }.empty?
+      @summary[:result] = ERROR unless @results.values.select{ |v| v[:result] == ERROR }.empty?
+      @summary[:cnt_all] = @results.count
+      @summary[:tests_passed] = @results.select{ |k,v| v[:result] == PASSED }
+      @summary[:tests_failure] = @results.select{ |k,v| v[:result] == FAILURE }
+      @summary[:tests_error] = @results.select{ |k,v| v[:result] == ERROR }
+      @summary[:tests_skipped] = @results.select{ |k,v| v[:result] == SKIPPED }
+      @summary[:cnt_passed] = @summary[:tests_passed].count
+      @summary[:cnt_failure] = @summary[:tests_failure].count
+      @summary[:cnt_error] = @summary[:tests_error].count
+      @summary[:cnt_skipped] = @summary[:tests_skipped].count
+    end
+    
+    def start_test(test)
+      @results[test.name] = { class: test.class, result: RUNNING, env: test.env, params: test.params, name: test.name, error: nil, failures: [], started_at: Time.now.to_f } 
+    end
+
+    def end_test(test)
+      # calculate result basing on errors/failures
+      @results[test.name][:finished_at] = Time.now.to_f
+      test.result = PASSED
+      test.result = FAILURE unless @results[test.name][:failures].empty?
+      unless @results[test.name][:error].nil?
+        if @results[test.name][:error].is_a? Moto::Exceptions::TestSkipped
+          test.result = SKIPPED
+        elsif @results[test.name][:error].is_a? Moto::Exceptions::TestForcedPassed
+          test.result = PASSED
+        elsif @results[test.name][:error].is_a? Moto::Exceptions::TestForcedFailure
+          add_failure(test, @results[test.name][:error].message)
+          test.result = FAILURE
+        else
+          test.result = ERROR
+        end
+      end
+      @results[test.name][:duration] = @results[test.name][:finished_at] - @results[test.name][:started_at]
+      @results[test.name][:result] = test.result
+    end
+
+    def add_failure(test, msg)
+      @results[test.name][:failures] << msg
+    end
+    
+    def add_error(test, e)
+      @results[test.name][:error] = e
+    end
+    
+  end
 end

data/lib/runner.rb

@@ -57,12 +57,14 @@ module Moto
 
     def run
       @listeners.each { |l| l.start_run }
+
       @tests.each do |test|
         @thread_pool.schedule do
           tc = ThreadContext.new(self, test)
           tc.run
         end
       end
+
       @thread_pool.shutdown
       @listeners.each { |l| l.end_run }
     end

data/lib/test.rb

@@ -36,6 +36,9 @@ module Moto
       set_name(params_index)
     end
 
+    # Sets name of the test based on its properties:
+    #  - number/name of currently executed configuration run
+    #  - env
     def set_name(params_index)
       if @env == :__default 
         return @name = "#{self.class.to_s}" if @params.empty?
@@ -48,6 +51,7 @@ module Moto
       end
       @name = self.class.to_s
     end
+    private :set_name
 
     def dir
       # puts self.class.path

data/lib/test_generator.rb

@@ -50,8 +50,33 @@ module Moto
     # Generates objects with tests that are supposed to be executed in this run.
     def generate_for_full_class_code(test_path_absolute)
       require test_path_absolute
-      class_name = test_path_absolute.gsub("#{MotoApp::DIR}/",'moto_app/').camelize.chomp('.rb').constantize
-      test_object = class_name.new
+
+      test_object = nil
+
+      # Checking if it's possible to create test based on provided path. In case something is wrong with
+      # modules structure in class itself Moto::Test will be instantized with raise injected into its run()
+      # so we can have proper reporting and summary even if the test doesn't execute.
+      begin
+        class_name = test_path_absolute.gsub("#{MotoApp::DIR}/",'moto_app/').camelize.chomp('.rb').constantize
+        test_object = class_name.new
+      rescue NameError
+        class_name = Moto::Test
+        test_object = class_name.new
+
+        class << test_object
+          attr_accessor :custom_name
+        end
+
+        test_object.custom_name = test_path_absolute.gsub("#{MotoApp::DIR}/",'moto_app/').camelize.chomp('.rb')
+
+        class << test_object
+          def run
+            raise "ERROR: Invalid module structure: #{custom_name}"
+          end
+        end
+
+      end
+
       test_object.static_path = test_path_absolute
       test_object.evaled = false
       test_object

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Moto
-  VERSION = '0.0.29'
+  VERSION = '0.0.30'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moto
 version: !ruby/object:Gem::Version
-  version: 0.0.29
+  version: 0.0.30
 platform: ruby
 authors:
 - Bartek Wilczek
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-10 00:00:00.000000000 Z
+date: 2016-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport