moto 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a53792d2e2c396c69d4304ea1ab6c1c4015fc895
-  data.tar.gz: f333327a20547acdd3f6ff7e4f97f15b0bea2016
+  metadata.gz: 9148f21a0e6aa5b6a157f4430be6e4669c8ebb5f
+  data.tar.gz: 493eceb7d79389aace5dfb095167ec1639024505
 SHA512:
-  metadata.gz: 73bf56964886a0525c9c2140341ae722870ecf5963e9fe2d641e9a9ca8342d5b6ec1bc956a898051a96b5235a15657ed1457e8be1e7546f12cbb2bfdfbd3f55b
-  data.tar.gz: a5b6188e9320d21e1bce04b9c5759260cebc2dbae5f34f2f5a916be756f0019ca455278158e3cc363ec9d4adc6669a3b113104cc6d5b4c6dcf1d01ec8a63d028
+  metadata.gz: 59ed4b2f7ce51f3c1480673de389ff26ca961502474253cca32de6189f0d2fe7404dc937331ede52bfb0c185296ef4fa5bf5c2255502b7d9a58f0283b97aa39c
+  data.tar.gz: 802ff8c1cef394da74787ea43433ce46f213ab67b48a5abefce6c3a5c48dad7acf846e0292363ba7390bae72c40f2c7f4ae4dd4d5045ac1033eb17973f3fffc2

data/lib/cli.rb

@@ -1,17 +1,22 @@
+# TODO: fix this dumb verification of current working directory
+unless File.exists? "#{Dir.pwd}/config/moto.rb"
+  puts "Config file (config/moto.rb) not present."
+  puts "Does current working directory contain Moto application?"
+  exit 1
+end
+
 require 'logger'
 require 'pp'
 require 'yaml'
 require 'active_support/inflector'
 require 'active_support/core_ext/object/blank'
-# require 'active_support/core_ext'
+
+require 'bundler/setup'
+Bundler.require
 
 APP_DIR = Dir.pwd
 MOTO_DIR = File.dirname(File.dirname(__FILE__))
 
-# TODO detect if cwd contains MotoApp
-
-require "#{APP_DIR}/config/moto"
-
 require_relative './empty_listener'
 require_relative './test_logging'
 require_relative './runner_logging'
@@ -44,7 +49,13 @@ module Moto
       
       # listeners = []
       listeners = [Moto::Listeners::Console]
-      runner = Moto::Runner.new(tests, listeners, thread_cnt: 3, environments: [:qa, :qa2])
+      environments = [:qa, :qa2]
+      # handle possible syntax error here
+      config = eval(File.read("#{APP_DIR}/config/moto.rb"))
+      # overwrite config with values from ARGV (if any given)
+      # e.g. config[:capybara][:default_driver] = :selenium
+      
+      runner = Moto::Runner.new(tests, listeners, environments, config)
       runner.run
     end
   

data/lib/clients/website.rb

@@ -10,17 +10,10 @@ module Moto
       ignore_logging(:page)
       ignore_logging(:context)
       ignore_logging(:session)
-  		
-  		def init
-  		  # can be overriden
-  		  @options = {
-  		    capybara_backend: :selenium
-  		  }
-  		end
-  		
+  		 		
       def start_run
         # TODO: make session driver configurable
-        @session = Capybara::Session.new(@options[:capybara_backend])
+        @session = Capybara::Session.new(context.runner.config[:capybara][:default_driver])
         @pages = {}
       end
       

data/lib/runner.rb

@@ -6,8 +6,9 @@ module Moto
     attr_reader :logger
     attr_reader :environments
     attr_reader :assert
+    attr_reader :config
     
-    def initialize(tests, listeners, config = {})
+    def initialize(tests, listeners, environments, config)
       @tests = tests
       @config = config
       @threads = []
@@ -20,7 +21,7 @@ module Moto
       @result = Result.new(self)
       
       # TODO: validate envs, maybe no-env should be supported as well?
-      @environments = config[:environments]
+      @environments = environments
       
       @listeners = []
       listeners.each do |l|
@@ -31,7 +32,7 @@ module Moto
     
     def run
       @listeners.each { |l| l.start_run }
-      test_slices = @tests.each_slice((@tests.size.to_f/@config[:thread_cnt]).ceil).to_a
+      test_slices = @tests.each_slice((@tests.size.to_f/@config[:thread_count]).ceil).to_a
       (0...test_slices.count).each do |i|
         @threads << Thread.new do
           tc = ThreadContext.new(self, test_slices[i])

data/lib/thread_context.rb

@@ -74,7 +74,7 @@ module Moto
             # TODO: remove log files from previous execution
             @logger = Logger.new(File.open(@log_path, File::WRONLY | File::TRUNC | File::CREAT))
             # TODO: make logger level configurable
-            @logger.level = Moto::Config::LOG_LEVEL
+            @logger.level = @runner.config[:log_level]
             @current_test = test
             @runner.listeners.each { |l| l.start_test(test) }
             @clients.each_value { |c| c.start_test(test) }

metadata

@@ -1,21 +1,37 @@
 --- !ruby/object:Gem::Specification
 name: moto
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Bartek Wilczek
-- Maciej Przybylski
+- Maciej Stark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-07 00:00:00.000000000 Z
-dependencies: []
+date: 2015-08-17 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'
 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
   for v.1.0.0 in the near future.
-email: bw@vouk.info
+email:
+- bwilczek@gmail.com
+- stark.maciej@gmail.com
 executables:
 - moto
 extensions: []
@@ -57,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.0.15
 signing_key: 
 specification_version: 4
 summary: Moto - yet another web testing framework