moto 0.0.45 → 0.0.51

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 570e7afde242d9a25456c73cf5775608e9c0d7b2
-  data.tar.gz: 2b98124618ef7ba8c535daa0d6108258f67c7d89
+  metadata.gz: a076c0650fb6ef90310fa2e9ef0f36665c02d7d1
+  data.tar.gz: f1582e2cb2ff664724a89636b26e3850ef03049e
 SHA512:
-  metadata.gz: bb1b7e3f51d037c34b682a11d07e1aa28d670e9ba642f0df105f74794f75b2bba18838dc2ffa9ac17f23dd158360bbeb53a1bf706540105268d138b193c41702
-  data.tar.gz: 1a3ee13460b66f2be096c9856e2c891fa21b5bdf7d1d821295c4841b92649bf859df11d2beb54a39ae993f93442e817296af823fc580bdf87e9b32853ca25296
+  metadata.gz: a889e5ad07bbb420b3d05f4ad4b1edf357f29c189190f05735de1f0e6d779bbd669615c66cd6da7c57d668b58ff2bca68c3c7f63a2fb513b019283fa44c266b3
+  data.tar.gz: 77e51385da1ae1a87dbafcfdf9e63d81ad134e7790d4456d1f2abc09a312e5ae5fbaf590326586d8c630b2aeabdb108e688b52f3dd0c28010c400425a85dfa98

data/lib/cli.rb

@@ -32,6 +32,7 @@ require_relative './exceptions/moto'
 require_relative './exceptions/test_skipped'
 require_relative './exceptions/test_forced_failure'
 require_relative './exceptions/test_forced_passed'
+require_relative 'config'
 
 module Moto
 
@@ -74,9 +75,9 @@ module Moto
         initializer.init
       end
 
-      test_reporter = Moto::Reporting::TestReporter.new(argv[:listeners], argv[:config], argv[:name])
+      test_reporter = Moto::Reporting::TestReporter.new(argv[:listeners], argv[:name])
 
-      runner = Moto::Runner::TestRunner.new(test_paths_absolute, argv[:environments], argv[:config], test_reporter)
+      runner = Moto::Runner::TestRunner.new(test_paths_absolute, argv[:environments], test_reporter)
       runner.run
     end
 

data/lib/clients/base.rb

@@ -24,6 +24,13 @@ module Moto
         # abstract
       end
 
+      # Retrieves specified key's value for current test environment
+      # @param [String] key Key which's value will be returned from merged config files
+      # @return [String] key's value
+      def const(key)
+        Moto::Lib::Config.environment_const(key)
+      end
+
     end
   end
 end

data/lib/clients/website.rb

@@ -1,4 +1,5 @@
 require 'capybara'
+require_relative '../../lib/config'
 
 module Moto
   module Clients
@@ -13,15 +14,22 @@ module Moto
 
       def init
         register_grid_driver
+        register_chrome_driver
       end
 
+      # @return [Hash] Config section for Capybara driver.
+      def config
+        Moto::Lib::Config.moto[:clients][:website][:capybara]
+      end
+      private :config
+
       def start_run
         # TODO: make session driver configurable
-        if context.moto_app_config_rb[:moto][:clients][:website][:capybara][:default_selector]
-          Capybara.default_selector = context.moto_app_config_rb[:moto][:clients][:website][:capybara][:default_selector]
+        if config[:default_selector]
+          Capybara.default_selector = config[:default_selector]
         end
 
-        Thread.current['capybara_session'] = Capybara::Session.new(context.moto_app_config_rb[:moto][:clients][:website][:capybara][:default_driver])
+        Thread.current['capybara_session'] = Capybara::Session.new(config[:default_driver])
         @pages = {}
       end
 
@@ -30,7 +38,6 @@ module Moto
       end
 
       def start_test(test)
-        # @context.current_test.logger.info("Hi mom, I'm opening some pages!")
         Thread.current['capybara_session'].reset_session!
       end
 
@@ -50,10 +57,8 @@ module Moto
         @pages[page_class_name]
       end
 
-      private
-
       def register_grid_driver
-        grid_config = context.moto_app_config_rb[:moto][:clients][:website][:capybara][:grid]
+        grid_config = config[:grid]
         return if grid_config.nil?
         if grid_config[:capabilities].nil?
           capabilities = Selenium::WebDriver::Remote::Capabilities.firefox
@@ -67,6 +72,16 @@ module Moto
                                         :desired_capabilities => capabilities)
         end
       end
+      private :register_grid_driver
+
+      def register_chrome_driver
+        Capybara.register_driver :chrome do |app|
+          client = Selenium::WebDriver::Remote::Http::Default.new
+          Capybara::Selenium::Driver.new(app, browser: :chrome, http_client: client)
+        end
+      end
+      private :register_chrome_driver
+
 
       def handle_test_exception(test, exception)
         #Thread.current['capybara_session'].save_screenshot "#{test.dir}/#{test.filename}_#{Time.new.strftime('%Y%m%d_%H%M%S')}.png"

data/lib/config.rb

@@ -0,0 +1,53 @@
+module Moto
+  module Lib
+    class Config
+
+      def self.load_configuration
+        if File.exists? "#{MotoApp::DIR}/config/moto.rb"
+          @@moto = eval(File.read("#{MotoApp::DIR}/config/moto.rb"))
+
+          @@env_consts = {}
+          Dir.glob('config/*.yml').each do |f|
+            @@env_consts.deep_merge! YAML.load_file(f)
+          end
+
+        else
+          raise "Config file (config/moto.rb) not present.\nDoes current working directory contain Moto application?"
+        end
+      end
+
+      # @return [Hash] Hash representing data from MotoApp/config/moto.rb file
+      def self.moto
+        @@moto
+      end
+
+      #
+      # @param [String] key Name of the key which's value is to be retrieved
+      # @return [String] Value of the key
+      def self.environment_const(key)
+        key = key.to_s
+        env = Thread.current['test_environment']
+
+        if env != :__default
+          key = "#{env.to_s}.#{key}"
+        end
+
+        code = if key.include? '.'
+                 "@@env_consts#{key.split('.').map { |a| "['#{a}']" }.join('')}"
+               else
+                 "@@env_consts['#{key}']"
+               end
+
+        begin
+          value = eval code
+          raise if value.nil?
+        rescue
+          raise "There is no const defined for key: #{key}. Environment: #{ (env == :__default) ? '<none>' : env }"
+        end
+
+        value
+      end
+
+    end
+  end
+end

data/lib/empty_listener.rb

@@ -1,17 +1,17 @@
-module Moto
-  module EmptyListener
-
-    def start_run
-    end
-    
-    def end_run
-    end
-    
-    def start_test(test)
-    end
-
-    def end_test(test)
-    end    
-
-  end
+module Moto
+  module EmptyListener
+
+    def start_run
+    end
+    
+    def end_run
+    end
+    
+    def start_test(test)
+    end
+
+    def end_test(test)
+    end    
+
+  end
 end

data/lib/exceptions/moto.rb

@@ -1,7 +1,7 @@
-module Moto
-  module Exceptions
-    class MotoException < RuntimeError
-      
-    end
-  end
+module Moto
+  module Exceptions
+    class MotoException < RuntimeError
+      
+    end
+  end
 end

data/lib/exceptions/test_forced_failure.rb

@@ -1,7 +1,7 @@
-module Moto
-  module Exceptions
-    class TestForcedFailure  < MotoException
-      
-    end
-  end
+module Moto
+  module Exceptions
+    class TestForcedFailure  < MotoException
+      
+    end
+  end
 end

data/lib/exceptions/test_forced_passed.rb

@@ -1,7 +1,7 @@
-module Moto
-  module Exceptions
-    class TestForcedPassed  < MotoException
-      
-    end
-  end
+module Moto
+  module Exceptions
+    class TestForcedPassed  < MotoException
+      
+    end
+  end
 end

data/lib/exceptions/test_skipped.rb

@@ -1,7 +1,7 @@
-module Moto
-  module Exceptions
-    class TestSkipped  < MotoException
-      
-    end
-  end
+module Moto
+  module Exceptions
+    class TestSkipped  < MotoException
+      
+    end
+  end
 end

data/lib/forward_context_methods.rb

@@ -10,11 +10,6 @@ module Moto
         @context.logger
       end
 
-      # Read const value specific for current environment from `config/const.yml` file
-      def const(key)
-        @context.const(key)
-      end
-
       # Access currently executed test
       def test
         @context.test

data/lib/page.rb

@@ -24,5 +24,12 @@ module Moto
       raise "Invalid state: page #{self.class.name} is not loaded." unless loaded?
     end
 
+    # Retrieves specified key's value for current test environment
+    # @param [String] key Key which's value will be returned from merged config files
+    # @return [String] key's value
+    def const(key)
+      Moto::Lib::Config.environment_const(key)
+    end
+
   end
 end

data/lib/parser.rb

@@ -3,7 +3,7 @@ require 'yaml'
 
 require_relative '../lib/cli'
 require_relative '../lib/app_generator'
-
+require_relative '../lib/config'
 module Moto
 
   class Parser
@@ -29,12 +29,7 @@ module Moto
 
     def self.run_parse(argv)
 
-      # TODO: fix this dumb verification of current working directory.
-      if !File.exists? "#{MotoApp::DIR}/config/moto.rb"
-        msg = "Config file (config/moto.rb) not present.\n"
-        msg << 'Does current working directory contain Moto application?'
-        raise msg
-      end
+      Moto::Lib::Config.load_configuration
 
       require 'bundler/setup'
       Bundler.require
@@ -43,29 +38,24 @@ module Moto
       options = {}
       options[:listeners] = []
       # 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 ?
-      # TODO const 
-      # TODO listeners should be consts - not strings
       OptionParser.new do |opts|
         opts.on('-t', '--tests Tests', Array)              { |v| options[:tests ] = v }
         opts.on('-g', '--tags Tags', Array)                { |v| options[:tags ] = v }
         opts.on('-l', '--listeners Listeners', Array)      { |v| options[:listeners] = v }
         opts.on('-e', '--environments Environment', Array) { |v| options[:environments] = v }
-        opts.on('-c', '--const Const')                     { |v| options[:const] = v }
         opts.on('-n', '--name Name')                       { |v| options[:name] = v }
-        opts.on('-f', '--config Config')                   { |v| options[:config].deep_merge!( eval( File.read(v) ) ) }
+        # opts.on('-f', '--config Config')                   { |v| options[:config].deep_merge!( eval( File.read(v) ) ) }
       end.parse!
 
       if options[:name].empty?
         options[:name] = evaluate_name(options[:tags], options[:tests])
       end
 
-      if options[ :config ][ :moto ][ :test_runner ][ :mandatory_environment ] && options[ :environments ].empty?
+      if Moto::Lib::Config.moto[:test_runner][:mandatory_environment] && options[:environments].empty?
         puts 'Environment is mandatory for this project.'
         exit 1
       end

data/lib/reporting/listeners/base.rb

@@ -5,13 +5,10 @@ module Moto
       # Base class for listeners that report results of testing 'outside' of the application.
       class Base
 
-        attr_reader :config
         attr_reader :custom_run_name
 
-        # @param [Hash] config
         # @param [String] custom_run_name Optional run name to be passed to listeners
-        def initialize(config, custom_run_name = '')
-          @config = config
+        def initialize(custom_run_name = '')
           @custom_run_name = custom_run_name
         end
 

data/lib/reporting/listeners/junit_xml.rb

@@ -6,7 +6,8 @@ module Moto
       class JunitXml < Base
 
         def end_run(run_status)
-          path = config[:output_file]
+
+          path =  Moto::Lib::Config.moto[:test_reporter][:listeners][:junit_xml][:output_file]
 
           run_status_hash = {
               errors:     run_status.tests_error.length,

data/lib/reporting/listeners/webui.rb

@@ -7,8 +7,9 @@ module Moto
       class Webui < Base
 
         def start_run
-          # POST http://sandbox.dev:3000/api/runs/create
-          @url = config[:url]
+
+          @url = Moto::Lib::Config.moto[:test_reporter][:listeners][:webui][:url]
+
           data = {
             name:         custom_run_name,
             result:       :running,

data/lib/reporting/test_reporter.rb

@@ -7,12 +7,11 @@ module Moto
     class TestReporter
       # @param [Array] listeners An array of strings, which represent qualified names of classes (listeners) that will be instantiated.
       #                empty array is passed then :default_listeners will be taken from config
-      # @param [Hash] config to be passed to listeners during creation
       # @param [String] custom_run_name Optional, to be passed to listeners during creation
-      def initialize(listeners, config, custom_run_name)
+      def initialize(listeners, custom_run_name)
 
         if listeners.empty?
-          config[:moto][:test_runner][:default_listeners].each do |listener_class_name|
+          config[:default_listeners].each do |listener_class_name|
             listeners << listener_class_name
           end
         else
@@ -22,7 +21,6 @@ module Moto
         end
 
         @listeners = []
-        @config = config
         @custom_run_name = custom_run_name
         listeners.each { |l| add_listener(l) }
       end
@@ -31,14 +29,7 @@ module Moto
       # All listeners on the list will have events reported to them.
       # @param [Moto::Listener::Base] listener class to be added
       def add_listener(listener)
-        @listeners << listener.new(listener_config(listener), @custom_run_name)
-      end
-
-      # @return [Hash] hash containing part of the config meant for a specific listener
-      # @param [Moto::Listener::Base] listener class for which config is to be retrieved
-      def listener_config(listener)
-        listener_symbol = listener.name.demodulize.underscore.to_sym
-        @config[:moto][:listeners][listener_symbol]
+        @listeners << listener.new(@custom_run_name)
       end
 
       # Reports start of the whole run (set of tests) to attached listeners
@@ -78,6 +69,12 @@ module Moto
         end
       end
 
+      # @return [Hash] Hash with config for TestReporter
+      def config
+        Moto::Lib::Config.moto[:test_reporter]
+      end
+      private :config
+
     end
   end
 end

data/lib/runner/test_provider.rb

@@ -8,10 +8,9 @@ module Moto
 
       # @param [Array] test_paths_absolute
       # @param [Array] environments Array
-      # @param [Integer] test_repeats
-      def initialize(test_paths_absolute, environments, test_repeats)
+      def initialize(test_paths_absolute, environments)
         super()
-        @test_repeats = test_repeats
+        @test_repeats = Moto::Lib::Config.moto[:test_runner][:test_repeats]
         @current_test_repeat = 1
         @queue = Queue.new
         @test_paths_absolute = test_paths_absolute

data/lib/runner/test_runner.rb

@@ -6,23 +6,20 @@ module Moto
     class TestRunner
 
       attr_reader :logger
-      attr_reader :config
       attr_reader :test_reporter
 
-      def initialize(test_paths_absolute, environments, config, test_reporter)
+      def initialize(test_paths_absolute, environments, test_reporter)
         @test_paths_absolute = test_paths_absolute
-        @config = config
         @test_reporter = test_reporter
 
         # TODO: initialize logger from config (yml or just ruby code)
         @logger = Logger.new(File.open("#{MotoApp::DIR}/moto.log", File::WRONLY | File::APPEND | File::CREAT))
-
         @environments = environments.empty? ? environments << :__default : environments
       end
 
       def run
-        test_provider = TestProvider.new(@test_paths_absolute, @environments, @config[:moto][:test_runner][:test_repeats])
-        threads_max = @config[:moto][:test_runner][:thread_count] || 1
+        test_provider = TestProvider.new(@test_paths_absolute, @environments)
+        threads_max = Moto::Lib::Config.moto[:test_runner][:thread_count] || 1
 
         # remove log/screenshot files from previous execution
         @test_paths_absolute.each do |test_path|
@@ -38,7 +35,7 @@ module Moto
           Thread.new do
             Thread.current[:id] = index
             loop do
-              tc = ThreadContext.new(@config, test_provider.get_test, @test_reporter)
+              tc = ThreadContext.new(test_provider.get_test, @test_reporter)
               tc.run
             end
           end

data/lib/runner/thread_context.rb

@@ -1,5 +1,6 @@
 require 'erb'
 require 'fileutils'
+require_relative '../../lib/config'
 
 module Moto
   module Runner
@@ -8,11 +9,8 @@ module Moto
       # all resources specific for single thread will be initialized here. E.g. browser session
       attr_reader :logger
       attr_reader :test
-      attr_reader :moto_app_config_yml
-      attr_reader :moto_app_config_rb
 
-      def initialize(config, test, test_reporter)
-        @config = config
+      def initialize(test, test_reporter)
         @test = test
         @clients = {}
         @test.context = self
@@ -20,15 +18,7 @@ module Moto
 
         # TODO: temporary fix
         Thread.current['context'] = self
-
-        # TODO: temporary fix (Configs rework incoming)
-        @moto_app_config_yml = {}
-        Dir.glob('config/*.yml').each do |f|
-          @moto_app_config_yml.deep_merge! YAML.load_file(f)
-        end
-
-        # TODO: temporary fix (Configs rework incoming)
-        @moto_app_config_rb = eval(File.read("#{MotoApp::DIR}/config/moto.rb"))
+        Thread.current['test_environment'] = @test.env
       end
 
       def client(name)
@@ -69,26 +59,10 @@ module Moto
         end
       end
 
-      def const(key)
-        key = key.to_s
-        key = "#{@test.env.to_s}.#{key}" if @test.env != :__default
-        code = if key.include? '.'
-                 "@moto_app_config_yml#{key.split('.').map { |a| "['#{a}']" }.join('')}"
-               else
-                 "@moto_app_config_yml['#{key}']"
-               end
-        begin
-          v = eval code
-          raise if v.nil?
-        rescue
-          raise "There is no const defined for key: #{key}. Environment: #{ (@test.env == :__default) ? '<none>' : @test.env }"
-        end
-        v
-      end
-
+      #
       def run
-        max_attempts = @config[:moto][:thread_context][:max_attempts] || 1
-        sleep_time = @config[:moto][:thread_context][:sleep_before_attempt] || 0
+        max_attempts = config[:test_attempt_max]   || 1
+        sleep_time   = config[:test_attempt_sleep] || 0
 
         log_directory = File.dirname(@test.log_path)
         if !File.directory?(log_directory)
@@ -96,7 +70,7 @@ module Moto
         end
 
         @logger = Logger.new(File.open(@test.log_path, File::WRONLY | File::TRUNC | File::CREAT))
-        @logger.level = @config[:moto][:thread_context][:log_level] || Logger::DEBUG
+        @logger.level = config[:test_log_level] || Logger::DEBUG
 
         # Reporting: start_test
         @test_reporter.report_start_test(@test.status)
@@ -145,6 +119,12 @@ module Moto
 
       end
 
+      # @return [Hash] Hash with config for ThreadContext
+      def config
+        Moto::Lib::Config.moto[:test_runner]
+      end
+      private :config
+
     end
   end
 end

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/base.rb

@@ -166,6 +166,13 @@ module Moto
         end
       end
 
+      # Read a constants value from YML configuration files while taking the current execution environment into the account.
+      # @param [String] key Key to be searched for.
+      # @return [String] Value of the key or nil if not found
+      def const(key)
+        Moto::Lib::Config.environment_const(key)
+      end
+
     end
   end
 end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Moto
-  VERSION = '0.0.45'
+  VERSION = '0.0.51'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moto
 version: !ruby/object:Gem::Version
-  version: 0.0.45
+  version: 0.0.51
 platform: ruby
 authors:
 - Bartek Wilczek
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-28 00:00:00.000000000 Z
+date: 2016-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -88,6 +88,7 @@ files:
 - lib/cli.rb
 - lib/clients/base.rb
 - lib/clients/website.rb
+- lib/config.rb
 - lib/empty_listener.rb
 - lib/exceptions/moto.rb
 - lib/exceptions/test_forced_failure.rb