moto 0.7.7 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a73bb34bd5c7176fa26edc1a7193286509f3515d
-  data.tar.gz: b3ea3cad75f7113162f26ed60a6db7c34a4bffc3
+  metadata.gz: 8b6682d6947aa0e2a4ab20dad51e6ce82dbbf5e4
+  data.tar.gz: e53c36116cfd2c832066f7054038ac58a34c3007
 SHA512:
-  metadata.gz: 9e37e42fc0eeec90537193bae67dc3235a793b7ff865f03740e22545b7238c706880c7379598afdea4a4df71cf970d756ffaee0305a00d34624ee58fcb15e19a
-  data.tar.gz: ddcfddfc1baf7dcf6f48266b2efa3e9f85922e2e963ff4b0f925838a05fc0273d11100db802346db9b76f7a09206eb44cbc60156a4b00abee4c7ac642a55f8dd
+  metadata.gz: 4d680940903bd84cf2491a4bbaa4ec796b2c1970d352402fa0b2bf219cd7937392c0471da609edc15bba245882552a2f942f40700ae26ac850767cf7e0264c5b
+  data.tar.gz: f122b9d617435150968650287dfc71d7ee64d8518134ebd0e4b7baf75f3a3e29370accd3bb2f3bba139e005c40e09368bf86122cb873a8a17673cd49202d55e8

data/lib/cli.rb

@@ -12,16 +12,13 @@ module Moto
   DIR = File.dirname(File.dirname(__FILE__))
 end
 
-require_relative './empty_listener'
 require_relative './test_logging'
 require_relative './runner_logging'
 require_relative './runner/test_runner'
 require_relative './runner/thread_context'
 require_relative './runner/test_generator'
 require_relative './test/base'
-require_relative './page'
 require_relative './version'
-require_relative './clients/base'
 require_relative './reporting/listeners/base'
 require_relative './reporting/listeners/console'
 require_relative './reporting/listeners/console_dots'

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/runner/test_generator.rb

@@ -62,23 +62,10 @@ module Moto
       end
       private :variantize
 
-      # assuming that target file includes only content of method 'run' and some magic comments
+      # Generates test instances
+      # @return [Moto::Test::Base]
       def generate(test_path_absolute)
-        method_body = File.read(test_path_absolute) + "\n"
-
-        full_code = !!method_body.match(/^#\s*FULL_CODE\s+/)
-
-        if full_code
-          generate_for_full_class_code(test_path_absolute)
-        else
-          generate_for_run_body(test_path_absolute, method_body)
-        end
-      end
-      private :generate
 
-      # Generates test instances, based on fully defined class file
-      # @return [Moto::Test::Base]
-      def generate_for_full_class_code(test_path_absolute)
         # 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::Base will be instantized with raise injected into its run()
         # so we can have proper reporting and summary even if the test doesn't execute.
@@ -98,52 +85,7 @@ module Moto
         test_object.evaled = false
         test_object
       end
-      private :generate_for_full_class_code
-
-      def create_module_tree(root_module, next_modules)
-        return root_module if next_modules.empty?
-        next_module_name = next_modules.shift
-        if root_module.const_defined?(next_module_name.to_sym)
-          m = root_module.const_get(next_module_name.to_sym)
-        else
-          m = Module.new
-          root_module.const_set(next_module_name.to_sym, m)
-        end
-        create_module_tree(m, next_modules)
-      end
-      private :create_module_tree
-
-      # Generates test instances, based on a text file with ruby code that has to be injected into run() method
-      # @return [Moto::Test::Base]
-      def generate_for_run_body(test_path_absolute, method_body)
-        base = Moto::Test::Base
-        base_class_string = method_body.match(/^#\s*BASE_CLASS:\s(\S+)/)
-        unless base_class_string.nil?
-          base_class_string = base_class_string[1].strip
-
-          a = base_class_string.underscore.split('/')
-          base_test_path = a[1..-1].join('/')
-
-          require "#{MotoApp::DIR}/#{base_test_path}"
-          base = base_class_string.constantize
-        end
-
-        # MotoApp::Tests::Login::Short
-        consts = test_path_absolute.camelize.split('Tests::')[1].split('::')
-        consts.pop
-        class_name = consts.pop
-
-        m = create_module_tree(MotoApp::Tests, consts)
-        cls = Class.new(base)
-        m.const_set(class_name.to_sym, cls)
-
-        test_object = cls.new
-        test_object.instance_eval("def run\n  #{method_body} \n end")
-        test_object.static_path = test_path_absolute
-        test_object.evaled = true
-        test_object
-      end
-      private :generate_for_run_body
+      private :generate
 
       # Injects raise into test.run so it will report an error when executed
       # @param [Moto::Test::Base] test An instance of test that is supposed to be modified

data/lib/runner/test_runner.rb

@@ -33,8 +33,6 @@ module Moto
           Thread.new do
             Thread.current[:id] = index
             loop do
-              Thread.current['clients_manager'] = Moto::Lib::Clients::ClientsManager.new
-
               tc = ThreadContext.new(test_provider.get_test, @test_reporter)
               tc.run
             end

data/lib/runner/thread_context.rb

@@ -1,7 +1,6 @@
 require 'erb'
 require 'fileutils'
 require_relative '../../lib/config'
-require_relative '../../lib/clients/clients_manager'
 
 module Moto
   module Runner
@@ -31,7 +30,6 @@ module Moto
 
         (1..max_attempts).each do |attempt|
 
-          Thread.current['clients_manager'].clients.each_value { |c| c.start_test(@test) }
           @test.before
           Thread.current['logger'].info("Start: #{@test.name} attempt #{attempt}/#{max_attempts}")
 
@@ -42,11 +40,9 @@ module Moto
           rescue Exception => e
             Thread.current['logger'].error("#{e.class.name}: #{e.message}")
             Thread.current['logger'].error(e.backtrace.join("\n"))
-            Thread.current['clients_manager'].clients.each_value { |c| c.handle_test_exception(@test, e) }
           end
 
           @test.after
-          Thread.current['clients_manager'].clients.each_value { |c| c.end_test(@test) }
 
           Thread.current['logger'].info("Result: #{@test.status.results.last.code}")
 
@@ -68,9 +64,6 @@ module Moto
 
         # Reporting: end_test
         @test_reporter.report_end_test(@test.status)
-
-        Thread.current['clients_manager'].clients.each_value { |c| c.end_run }
-
       end
 
       # @return [Hash] Hash with config for ThreadContext

data/lib/test/base.rb

@@ -52,17 +52,6 @@ module Moto
         @log_path
       end
 
-      #TODO Remove possibly?
-      # def dir
-      #   return File.dirname(static_path) unless static_path.nil?
-      #   File.dirname(self.path)
-      # end
-      #
-      # def filename
-      #   return File.basename(static_path, '.*') unless static_path.nil?
-      #   File.basename(path, '.*')
-      # end
-
       # Use this to run test
       # Initializes status, runs test, handles exceptions, finalizes status after run completion
       def run_test
@@ -164,14 +153,6 @@ module Moto
         Moto::Lib::Config.environment_const(key)
       end
 
-      def client(name)
-        Thread.current['clients_manager'].client(name)
-      end
-
-      def session
-        client('Website').session
-      end
-
     end
   end
 end

data/lib/test_logging.rb

@@ -12,10 +12,6 @@ module Moto
       
       def cls.method_added(name)
 
-        Moto::EmptyListener.instance_methods(false).each do |m|
-          full_name = "#{self.name}::#{m}"
-          @@ignore_logging << full_name unless @@ignore_logging.include? full_name
-        end
         @@ignore_logging << "#{self.name}::new"
         @@ignore_logging << "#{self.name}::initialize"
 

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Moto
-  VERSION = '0.7.7'
+  VERSION = '0.8.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moto
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.8.0
 platform: ruby
 authors:
 - Bartek Wilczek
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-23 00:00:00.000000000 Z
+date: 2016-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -86,9 +86,6 @@ files:
 - bin/moto
 - lib/app_generator.rb
 - lib/cli.rb
-- lib/clients/base.rb
-- lib/clients/clients_manager.rb
-- lib/clients/website.rb
 - lib/config.rb
 - lib/empty_listener.rb
 - lib/exceptions/moto.rb
@@ -96,7 +93,6 @@ files:
 - lib/exceptions/test_forced_passed.rb
 - lib/exceptions/test_skipped.rb
 - lib/initializer.rb
-- lib/page.rb
 - lib/parser.rb
 - lib/reporting/listeners/base.rb
 - lib/reporting/listeners/console.rb

data/lib/clients/base.rb

@@ -1,30 +0,0 @@
-module Moto
-  module Clients
-
-    class Base
-      include Moto::EmptyListener
-
-      # include Moto::RunnerLogging
-      include Moto::TestLogging
-
-      ignore_logging(:handle_test_exception)
-
-      def handle_test_exception(test, exception)
-        # 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
-
-      # Access client defined in Moto or MotoApp via it's name
-      def client(name)
-        Thread.current['clients_manager'].client(name)
-      end
-
-    end
-  end
-end

data/lib/clients/clients_manager.rb

@@ -1,51 +0,0 @@
-module Moto
-  module Lib
-    module Clients
-      class ClientsManager
-
-        attr_reader :clients
-
-        def initialize
-          @clients = {}
-        end
-
-        def client(name)
-          return @clients[name] if @clients.key? name
-
-          name_app = 'MotoApp::Lib::Clients::' + name
-          name_moto = 'Moto::Clients::' + name
-
-          client = try_client(name_app, "#{MotoApp::DIR}/")
-          if client
-            @clients[name] = client
-            return client
-          end
-
-          client = try_client(name_moto, "#{Moto::DIR}/lib/")
-          if client
-            @clients[name] = client
-            return client
-          end
-
-          raise "Could not find client class for name: #{name}"
-        end
-
-        def try_client(name, dir)
-            client_path = name.underscore.split('/')[1..-1].join('/')
-
-            if File.file?(dir + client_path + '.rb')
-              require dir + client_path
-              client_const = name.constantize
-              instance = client_const.new
-              instance.start_run
-              instance
-            else
-              nil
-            end
-        end
-        private :try_client
-
-      end
-    end
-  end
-end

data/lib/clients/website.rb

@@ -1,103 +0,0 @@
-require 'capybara'
-require 'capybara/poltergeist'
-require_relative '../../lib/config'
-
-module Moto
-  module Clients
-
-    class Website < Moto::Clients::Base
-
-      ignore_logging(:session)
-
-      def initialize
-        register_grid_driver
-        register_chrome_driver
-        register_poltergeist_driver
-
-        if config[:default_selector]
-          Capybara.default_selector = config[:default_selector]
-        end
-      end
-
-      # Returns Capybara session, if none was available for this thread it will create one.
-      def session
-        if Thread.current['capybara_session'].nil?
-          Thread.current['capybara_session'] = Capybara::Session.new(config[:default_driver])
-          Thread.current['capybara_session'].driver.browser.manage.window.maximize
-        end
-
-        Thread.current['capybara_session']
-      end
-
-      # @return [Hash] Config section for Capybara driver.
-      def config
-        Moto::Lib::Config.moto[:clients][:website][:capybara]
-      end
-      private :config
-
-      def start_run
-
-      end
-
-      def end_run
-        Thread.current['capybara_session'].driver.quit
-      end
-
-      def start_test(test)
-        Thread.current['capybara_session'].reset_session!
-      end
-
-      def end_test(test)
-        Thread.current['capybara_session'].reset_session!
-      end
-
-      def register_grid_driver
-        grid_config = config[:grid]
-        return if grid_config.nil?
-        if grid_config[:capabilities].nil?
-          capabilities = Selenium::WebDriver::Remote::Capabilities.firefox
-        else
-          capabilities = Selenium::WebDriver::Remote::Capabilities.new(grid_config[:capabilities])
-        end
-        Capybara.register_driver :grid do |app|
-          Capybara::Selenium::Driver.new(app,
-                                        :browser => :remote,
-                                        :url => grid_config[:url],
-                                        :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
-          client.timeout = 180
-          caps = Selenium::WebDriver::Remote::Capabilities.chrome("chromeOptions" => {"args" => [ "-no-sandbox" , "--start-maximized"] })
-          Capybara::Selenium::Driver.new(app, browser: :chrome, http_client: client, desired_capabilities: caps )
-        end
-      end
-      private :register_chrome_driver
-
-      def register_poltergeist_driver
-        #Capybara.javascript_driver = :poltergeist
-        options =
-          {
-              screen_size: [1920,1080],
-              js_errors: false,
-              phantomjs_options: ['--ignore-ssl-errors=yes'],
-
-          }
-        Capybara.register_driver :poltergeist do |app|
-          Capybara::Poltergeist::Driver.new(app, options)
-        end
-      end
-      private :register_poltergeist_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"
-      end
-
-    end
-  end
-end

data/lib/page.rb

@@ -1,26 +0,0 @@
-module Moto
-  class Page
-
-    include Moto::TestLogging
-
-    ignore_logging :const
-    ignore_logging :session
-
-    # Returns Capybara's session by means of on-the-fly client&session creation.
-    def session
-      Thread.current['clients_manager'].client('Website').session
-    end
-
-    def raise_unless_loaded
-      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