moto 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d13c936e69cf45887f9b71a57ed70ff927278746
-  data.tar.gz: 3caa5e91cff3fff305b46f5e42b07b7798ae7b4b
+  metadata.gz: 4e0d2bc8cf0fdd04c80ef51518748b2f3091f4be
+  data.tar.gz: cffe21eadaa97d2469aca4754f7e23ef5c1e1ac2
 SHA512:
-  metadata.gz: e35a1532511468cd22cc6a1510162e7e422206603c8ac0c771bf9eaac7e51122a1293ea4473744dade418d1a11efae8adde0d94f9c3e9ae0ede7eb320380d54e
-  data.tar.gz: f17872321fced47b4af3772c548c55f9db95d5e0d88d875473a0ab384cd692a8a90f11751f812dd463163ddddf30c358a800d1fc2369a2d9d3dd0cfbb8b0ff85
+  metadata.gz: 8f25fd63074145f9a8a30377e29b556d9da74f7181b685649e578365fda45ac0944da13b20fd074dd5eeb14e204c055a13e670a42d67b9565b9301ab1da6d973
+  data.tar.gz: 11be7c4eedb48b8b8d8afdbabb1b56122e570db463c35f7f130ad7814f2de30df133fa61fa41be1d72edd93d8138c1cd1036616b30a2699b558d3af07d345e4b

data/lib/cli.rb

@@ -37,6 +37,7 @@ require_relative './listeners/base'
 require_relative './listeners/console'
 require_relative './listeners/console_dots'
 require_relative './listeners/junit_xml'
+require_relative './listeners/webui'
 require_relative './test_generator'
 require_relative './exceptions/moto'
 require_relative './exceptions/test_skipped'
@@ -63,11 +64,11 @@ module Moto
         tests_total = Dir.glob("#{MotoApp::DIR}/tests/**/*.rb")
         argv[ :tags ].each do |tag_name|
           tests_total.each do |test_dir|
-            test_body = File.read (test_dir)
+            test_body = File.read(test_dir)
             test_body.each_line do |line|
               line = line.delete(' ')
               if line.include?( '#MOTO_TAGS')
-                if line.include? (tag_name + ',')
+                if line.include?(tag_name + ',')
                   test_paths_absolute.include?(test_dir) || test_paths_absolute << test_dir
                   break
                 else
@@ -95,7 +96,7 @@ module Moto
         listeners << r.constantize
       end
       
-      runner = Moto::Runner.new(test_classes, listeners, argv[ :environments ], argv[ :config ])
+      runner = Moto::Runner.new(test_classes, listeners, argv[:environments], argv[:config], argv[:name])
       runner.run
     end
   

data/lib/listeners/webui.rb

@@ -0,0 +1,69 @@
+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 ) )
+      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,
+          env: test.env,
+          parameters: test.params.to_s,
+          result: Moto::Result::RUNNING,
+          error: nil,
+          failures: nil,
+        }
+        @test = 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]
+        }        
+        @test = JSON.parse( RestClient.put( "#{@url}/api/tests/#{@test['id']}", data.to_json, :content_type => :json, :accept => :json ) )
+      end
+
+    end
+  end
+end

data/lib/parser.rb

@@ -26,6 +26,7 @@ module Moto
       # TODO Mandatory env var in app config
       options[:config] = eval(File.read("#{MotoApp::DIR}/config/moto.rb"))
       options[:environments] = []
+      options[:name] = ""
          
       # Parse arguments
       # TODO eval ?
@@ -37,9 +38,14 @@ module Moto
           opts.on('-r', '--reporters Reporters', Array) { |v| options[:reporters] = v }
           opts.on('-e', '--environments Environment', Array) { |v| options[:environments] = v }
           opts.on('-c', '--const Const') { |v| options[:const] = v }
-          opts.on('-cfg', '--config Config') { |v| options[:config] = options[:config].merge( eval( v ) ) }
+          opts.on('-n', '--name Name') { |v| options[:name] = v }
+          opts.on('-f', '--config Config') { |v| options[:config] = options[:config].merge( eval( v ) ) }
       end.parse!
 
+      if options[:name].empty?
+        options[:name] = evaluate_name(options[:tags], options[:tests])
+      end
+
       if options[ :config ][ :moto ][ :runner ][ :mandatory_environment ] && options[ :environments ].empty?
         puts 'Environment is mandatory for this project.'
         exit 1
@@ -48,6 +54,18 @@ module Moto
       return options
     end
     
+    def self.evaluate_name(tags, tests)
+      tags ||= ""
+      tests ||= ""
+      if !tags.empty? && !tests.empty?
+        return "#{tags.count} tags + #{tests.count} tests"
+      elsif tags.empty?
+        return tests.count == 1 ? "Test: #{tests.first}" : "#{tests.count} tests"
+      elsif tests.empty?
+        return tags.count == 1 ? "Tag: #{tags.first}" : "#{tags.count} tags"
+      end
+    end
+    
     def self.generate_parse(argv)
       options = {}
       options[:dir]

data/lib/runner.rb

@@ -7,11 +7,13 @@ module Moto
     attr_reader :environments
     attr_reader :assert
     attr_reader :config
+    attr_reader :name
     
-    def initialize(tests, listeners, environments, config)
+    def initialize(tests, listeners, environments, config, name)
       @tests = tests
       @config = config
       @threads = []
+      @name = name
       
       # TODO: initialize logger from config (yml or just ruby code)
       # @logger = Logger.new(STDOUT)

data/lib/test.rb

@@ -10,6 +10,7 @@ module Moto
     attr_reader :env
     attr_reader :params
     attr_writer :static_path
+    attr_accessor :log_path
 
     class << self
       attr_accessor :_path

data/lib/thread_context.rb

@@ -4,7 +4,7 @@ module Moto
     # all resources specific for single thread will be initialized here. E.g. browser session
     attr_reader :runner
     attr_reader :logger
-    attr_reader :log_path
+    # attr_reader :log_path
     attr_reader :current_test
     
     def initialize(runner, tests)
@@ -91,8 +91,8 @@ module Moto
             (1..max_attempts).each do |attempt|
               test.init(env, params)
               # TODO: log path might be specified (to some extent) by the configuration
-              @log_path = "#{test.dir}/#{test.name.gsub(/\s+/, '_').gsub('::', '_').gsub('/', '_')}.log"
-              @logger = Logger.new(File.open(@log_path, File::WRONLY | File::TRUNC | File::CREAT))
+              test.log_path = "#{test.dir}/#{test.name.gsub(/\s+/, '_').gsub('::', '_').gsub('/', '_')}.log"
+              @logger = Logger.new(File.open(test.log_path, File::WRONLY | File::TRUNC | File::CREAT))
               # TODO: make logger level configurable
               @logger.level = @runner.my_config[:log_level]
               @current_test = test
@@ -112,9 +112,11 @@ module Moto
               end 
               test.after
               @clients.each_value { |c| c.end_test(test) }
-              @runner.listeners.each { |l| l.end_test(test) }
+              # HAX: running end_test on results now, on other listeners after logger is closed
+              @runner.listeners.first.end_test(test)
               @logger.info("Result: #{test.result}")
               @logger.close
+              @runner.listeners[1..-1].each { |l| l.end_test(test) }
               break unless [Result::FAILURE, Result::ERROR].include? test.result
             end # RETRY
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moto
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Bartek Wilczek
@@ -39,6 +39,34 @@ dependencies:
     - - '>='
       - !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
   for web applications functional testing. It supports (or will support) threading,
   scenario parametrization, different test environments and much more. Stay tuned
@@ -75,6 +103,7 @@ files:
 - 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: