moto 0.0.40 → 0.0.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b5492188f2eeb8cc2270194377f7da621456203
-  data.tar.gz: 95f4afebe273fdcf4a6a5482457f0193aee3dc6c
+  metadata.gz: bf93fd70753923c7fc9cbfe2dc875ecdf1cfe921
+  data.tar.gz: 8ff87b16800860ce7822ca64a043b38f81595546
 SHA512:
-  metadata.gz: 8f0d02d6cffea6babcb5126ae4e0c538a8600fce9617e6566a2709dbd582e3de82b54eeb47f414166aa19fce854022966a2b36c703071df84861b061e9052bcb
-  data.tar.gz: 4d636279703d273404c25ca98c6c83a74676da594daf0d33ee6fc87854a743743cc5cc5a935b3fe8519dec776046527ffcb114f1d0acb44ae4192694dbc282d5
+  metadata.gz: 70bd158386cfec28f21f84f865436208fb1c6e643e76482660189c26c38d49170335eb111811bf76641b2bb3ffc68be13113e68408316c2ba993b3cffcfbd3ee
+  data.tar.gz: c7b4f4568a95e40913d2008ef376e1b53db7bf585aa67f70fb223d08a6d31b2ac67ba6f02a83391edef32358f2293a021ec95da9e668051e53a0db1257cbcc54

data/lib/clients/website.rb

@@ -17,11 +17,11 @@ module Moto
 
       def start_run
         # TODO: make session driver configurable
-        if context.moto_app_config[:capybara][:default_selector]
-          Capybara.default_selector = context.moto_app_config[:capybara][:default_selector]
+        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]
         end
 
-        Thread.current['capybara_session'] = Capybara::Session.new(context.moto_app_config[:capybara][:default_driver])
+        Thread.current['capybara_session'] = Capybara::Session.new(context.moto_app_config_rb[:moto][:clients][:website][:capybara][:default_driver])
         @pages = {}
       end
 
@@ -53,7 +53,7 @@ module Moto
       private
 
       def register_grid_driver
-        grid_config = context.moto_app_config[:capybara][:grid]
+        grid_config = context.moto_app_config_rb[:moto][:clients][:website][:capybara][:grid]
         return if grid_config.nil?
         if grid_config[:capabilities].nil?
           capabilities = Selenium::WebDriver::Remote::Capabilities.firefox

data/lib/runner/test_runner.rb

@@ -20,10 +20,6 @@ module Moto
         @environments = environments.empty? ? environments << :__default : environments
       end
 
-      def running_thread_count
-        Thread.list.select {|thread| thread.status == "run"}.count
-      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

data/lib/runner/thread_context.rb

@@ -8,7 +8,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
+      attr_reader :moto_app_config_yml
+      attr_reader :moto_app_config_rb
 
       def initialize(config, test, test_reporter)
         @config = config
@@ -20,11 +21,14 @@ module Moto
         # TODO: temporary fix
         Thread.current['context'] = self
 
-        # TODO: temporary fix
-        @moto_app_config = {}
+        # TODO: temporary fix (Configs rework incoming)
+        @moto_app_config_yml = {}
         Dir.glob('config/*.yml').each do |f|
-          @moto_app_config.deep_merge! YAML.load_file(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"))
       end
 
       def client(name)
@@ -69,9 +73,9 @@ module Moto
         key = key.to_s
         key = "#{@test.env.to_s}.#{key}" if @test.env != :__default
         code = if key.include? '.'
-                 "@moto_app_config#{key.split('.').map { |a| "['#{a}']" }.join('')}"
+                 "@moto_app_config_yml#{key.split('.').map { |a| "['#{a}']" }.join('')}"
                else
-                 "@moto_app_config['#{key}']"
+                 "@moto_app_config_yml['#{key}']"
                end
         begin
           v = eval code

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Moto
-  VERSION = '0.0.40'
+  VERSION = '0.0.41'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moto
 version: !ruby/object:Gem::Version
-  version: 0.0.40
+  version: 0.0.41
 platform: ruby
 authors:
 - Bartek Wilczek
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-21 00:00:00.000000000 Z
+date: 2016-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport