moto 0.9.11 → 0.9.17

data/lib/reporting/test_reporter.rb

@@ -1,5 +1,4 @@
 require_relative 'run_status'
-require_relative 'listeners/base'
 
 module Moto
   module Reporting

data/lib/test/base.rb

@@ -28,7 +28,6 @@ module Moto
 
       # Initializes test to be executed with specified params and environment
       def init(params_path)
-        @env = Moto::Lib::Config.environment
         @params = []
         @params_path = params_path
 
@@ -40,7 +39,6 @@ module Moto
         @status.test_class_name = self.class.name
         @status.display_name = @status.test_class_name.split('::')[2..-2].join(' > ')
         @status.display_name += "_#{@params_path.split('/')[-1].chomp('.param')}" if @params_path
-        @status.env = Moto::Lib::Config.environment
       end
 
       # Setter for :log_path

data/lib/{runner/test_generator.rb → test/generator.rb}

@@ -1,11 +1,13 @@
+require_relative 'base'
+
 module MotoApp
   module Tests
   end
 end
 
 module Moto
-  module Runner
-    class TestGenerator
+  module Test
+    class Generator
 
       def initialize
         @internal_counter = 0
@@ -16,10 +18,11 @@ module Moto
       #   Example: A test with a config file and 2 sets of parameters there will be returned as array with two elements.
       #
       # @param [Moto::Test::Metadata] test_metadata Metadata that describes test to be instantiated
+      # @param [Integer] variants_limit Limit how many params will be parsed per test. Default: 0 (no limit)
       # @return [Array] An array of [Moto::Test::Base] descendants
       #                 each entry is a Test with set of parameters injected
-      def get_test_with_variants(test_metadata)
-        variantize(test_metadata)
+      def get_test_with_variants(test_metadata, variants_limit = 0)
+        variantize(test_metadata, variants_limit)
       end
 
       # Converts test's path to an array of Moto::Base::Test instances that represent all test variants (params)
@@ -29,36 +32,36 @@ module Moto
       # they must be required prior to that. That might be done in overloaded app's initializer.
       #
       # @param [Moto::Test::Metadata] test_metadata Metadata that describes test to be instantiated, contains path to test
+      # @param [Integer] variants_limit Limit how many params will be parsed per test.
       # @return [Array] array of already initialized test's variants
-      def variantize(test_metadata)
+      def variantize(test_metadata, variants_limit)
         variants = []
 
-          # TODO CHANGED TEMPORARY
-          #params_path = test_path_absolute.sub(/\.rb\z/, '')
-          params_directory = File.dirname(test_metadata.test_path).to_s + '/params/**'
-          param_files_paths = Dir.glob(params_directory)
-          param_files_paths = [nil] if param_files_paths.empty?
+        # TODO CHANGED TEMPORARY
+        #params_path = test_path_absolute.sub(/\.rb\z/, '')
+        params_directory = File.dirname(test_metadata.test_path).to_s + '/params/**'
+        param_files_paths = Dir.glob(params_directory)
+        param_files_paths = [nil] if param_files_paths.empty?
 
-          param_files_paths.each do |params_path|
+        param_files_paths.each do |params_path|
 
-            #TODO environment support
-            # Filtering out param sets that are specific to certain envs
-            # unless params['__env'].nil?
-            #   allowed_envs = params['__env'].is_a?(String) ? [params['__env']] : params['__env']
-            #   next unless allowed_envs.include?(Moto::Lib::Config.environment)
-            # end
+          # TODO Name/logname/displayname
+          test = generate(test_metadata)
+          test.init(params_path)
+          test.log_path = "#{File.dirname(test_metadata.test_path).to_s}/logs/#{test.name.gsub(/[^0-9A-Za-z.\-]/, '_')}.log"
+          @internal_counter += 1
 
-            #TODO Name/logname/displayname
-            test = generate(test_metadata)
-            test.init(params_path)
-            test.log_path = "#{File.dirname(test_metadata.test_path).to_s}/logs/#{test.name.gsub(/[^0-9A-Za-z.\-]/, '_')}.log"
-            @internal_counter += 1
+          variants << test
 
-            variants << test
+          # Break if limit of parametrized variants has been reached
+          if variants_limit > 0 && variants.length == variants_limit
+            break
           end
+        end
 
         variants
       end
+
       private :variantize
 
       # Generates test instances

data/lib/test/metadata.rb

@@ -32,7 +32,7 @@ module Moto
       end
       private :text
 
-      # @return [Array] of [String] which represent contents of #MOTO_TAGS
+      # @return [Array<String>] which represent contents of #MOTO_TAGS
       def tags
         if @tags.nil?
           matches = text.match(/^#(\s*)MOTO_TAGS:(.*?)$/)

data/lib/test/metadata_generator.rb

@@ -0,0 +1,78 @@
+require 'logger'
+require 'pp'
+require 'yaml'
+
+module MotoApp
+  DIR = Dir.pwd
+end
+
+require_relative 'metadata'
+require_relative '../version'
+require_relative '../config'
+
+module Moto
+  module Test
+    class MetadataGenerator
+
+      def self.generate(directories = nil, tags = nil, filters = nil)
+        tests_metadata = []
+
+        if directories
+          directories.each do |directory|
+            Dir.glob("#{MotoApp::DIR}/tests/#{directory}/**/*.rb").each do |test_path|
+              tests_metadata << Moto::Test::Metadata.new(test_path)
+            end
+          end
+        end
+
+        if tags
+          tests_total = Dir.glob("#{MotoApp::DIR}/tests/**/*.rb")
+          tests_total.each do |test_path|
+
+            metadata = Moto::Test::Metadata.new(test_path)
+            tests_metadata << metadata unless (tags & metadata.tags).empty?
+
+          end
+        end
+
+        # Make sure there are no repetitions in gathered set
+        tests_metadata.uniq! {|metadata| metadata.test_path}
+
+        # Filter tests by provied tags
+        # - test must contain ALL tags specified with -f param
+        # - use ~ for negation
+        # - test may contain other tags
+        if filters
+          filters.each do |filter|
+            filtered = tests_metadata.select do |metadata|
+              next if metadata.tags.empty?
+              filter_matches_any_tag?(filter, metadata.tags) || filter_negation_matches_none_tag?(filter, metadata.tags)
+            end
+            tests_metadata &= filtered
+          end
+        end
+
+        # TODO: THIS SHOULDN'T BE HERE - REMNANT OF THE PAST
+        # Requires custom initializer if provided by application that uses Moto
+        if File.exists?("#{MotoApp::DIR}/lib/initializer.rb")
+          require("#{MotoApp::DIR}/lib/initializer.rb")
+          initializer = MotoApp::Lib::Initializer.new
+          initializer.init
+        end
+
+        return tests_metadata
+      end
+
+      def self.filter_matches_any_tag?(filter, tags)
+        !filter.start_with?('~') && tags.any? {|tag| filter == tag}
+      end
+      private_class_method :filter_matches_any_tag?
+
+      def self.filter_negation_matches_none_tag?(filter, tags)
+        filter.start_with?('~') && tags.none? {|tag| filter[1..-1] == tag}
+      end
+      private_class_method :filter_negation_matches_none_tag?
+
+    end
+  end
+end

data/lib/test/status.rb

@@ -20,9 +20,6 @@ module Moto
       # Array of [Moto::Test::Result], each item represents a result of a single attempt to pass the test
       attr_reader :results
 
-      # Environment on which test was run
-      attr_accessor :env
-
       # Set of params on which test was based
       attr_accessor :params
 

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Moto
-  VERSION = '0.9.11'
+  VERSION = '0.9.17'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moto
 version: !ruby/object:Gem::Version
-  version: 0.9.11
+  version: 0.9.17
 platform: ruby
 authors:
 - Bartek Wilczek
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-31 00:00:00.000000000 Z
+date: 2017-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -84,32 +84,32 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/moto
-- lib/app_generator.rb
-- lib/cli.rb
 - lib/config.rb
 - lib/empty_listener.rb
-- lib/exceptions/moto.rb
+- lib/exceptions/base.rb
 - lib/exceptions/test_forced_failure.rb
 - lib/exceptions/test_forced_passed.rb
 - lib/exceptions/test_skipped.rb
-- lib/initializer.rb
-- lib/parser.rb
+- lib/modes/generate/test_template_generator.rb
+- lib/modes/mode_selector.rb
+- lib/modes/run/dry_runner.rb
+- lib/modes/run/test_provider.rb
+- lib/modes/run/test_runner.rb
+- lib/modes/run/thread_context.rb
+- lib/modes/validate/test_validator.rb
+- lib/parameter_parser.rb
 - lib/reporting/listeners/base.rb
 - lib/reporting/listeners/console.rb
 - lib/reporting/listeners/console_dots.rb
 - lib/reporting/listeners/junit_xml.rb
 - lib/reporting/listeners/webui.rb
-- lib/reporting/listeners/webui_deprecated.rb
 - lib/reporting/run_status.rb
 - lib/reporting/test_reporter.rb
-- lib/runner/dry_runner.rb
-- lib/runner/test_generator.rb
-- lib/runner/test_provider.rb
-- lib/runner/test_runner.rb
-- lib/runner/thread_context.rb
 - lib/runner_logging.rb
 - lib/test/base.rb
+- lib/test/generator.rb
 - lib/test/metadata.rb
+- lib/test/metadata_generator.rb
 - lib/test/result.rb
 - lib/test/status.rb
 - lib/test_logging.rb
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Moto - yet another web testing framework

data/lib/app_generator.rb

@@ -1,80 +0,0 @@
-require 'fileutils'
-
-module Moto
-  class AppGenerator
-
-    # Creates directories and file with class template for a test.
-    # @param options [Hash] Informations required perfrom the task.
-    #   options[:app_name]        Name of the application that uses Moto Framework.
-    #   options[:dir]             Subdirectories of MotoApp/tests/ where test should be placed.
-    #   options[:base_class]      Path and filename of class from which the test will derive.
-    #   options[:force]           Whether generator should forcibly overwrite previously existing file.
-    def self.run(options)
-
-      # Build list of modules basing on the name of the application and subdirectory provided by the user.
-      # Second module is always 'tests' since it's where they should be kept.
-      modules = [options[:app_name], 'tests'] + options[:dir].split('/')
-      modules.map!(&:camelize)
-
-      # Name of the class in the template
-      class_name = modules.last
-
-      # Evaluate fully qualified name of the class to derive from or, if not specified
-      # use Moto's default one
-      if options[:base_class].nil?
-        base_class_qualified_name = 'Moto::Test::Base'
-      else
-        base_class_qualified_name = "#{options[:app_name]}::Lib::Test::#{options[:base_class].split('/').join('::').camelize}"
-      end
-
-      # Where to put finished template
-      test_file = File.basename(options[:dir]) + '.rb'
-      test_dir = MotoApp::DIR + '/tests/' + options[:dir]
-      test_path = "#{test_dir}/#{test_file}"
-
-      # Create directory
-      FileUtils.mkdir_p(test_dir)
-
-      if !File.exist?(test_path) || options[:force]
-        # Create new file in specified location and add class' template to it
-        File.open(test_path, 'w+') do |file|
-
-          indent = 0
-
-          file << "# FULL_CODE\n"
-
-          if options[:base_class].nil?
-            file << "\n"
-          else
-            file << "require './lib/test/#{options[:base_class]}.rb'\n\n"
-          end
-
-          modules.each do |m|
-            file << (' ' * indent) + "module #{m}\n"
-            indent += 2
-          end
-
-          file << (' ' * indent) + "# Class template genereated by 'moto generate'\n"
-          file << (' ' * indent) + "class #{class_name} < #{base_class_qualified_name}\n\n"
-          indent += 2
-          file << (' ' * indent) + "def run\n"
-          file << (' ' * indent) + "end\n\n"
-          indent -= 2
-          file << (' ' * indent) + "end\n"
-
-          modules.each do
-            indent -= 2
-            file << (' ' * indent) + "end\n"
-          end
-
-        end
-
-        puts 'Result:'
-        puts "  File: #{test_path}"
-        puts "  Class: #{class_name} < #{base_class_qualified_name}"
-      else
-        raise 'File already exists. Use -f or --force to overwrite existing contents.'
-      end
-    end
-  end
-end

data/lib/cli.rb

@@ -1,120 +0,0 @@
-require 'logger'
-require 'pp'
-require 'yaml'
-require 'active_support/inflector'
-require 'active_support/core_ext/object/blank'
-
-module MotoApp
-  DIR = Dir.pwd
-end
-
-module Moto
-  DIR = File.dirname(File.dirname(__FILE__))
-end
-
-require_relative './test_logging'
-require_relative './runner_logging'
-require_relative './runner/dry_runner'
-require_relative './runner/test_runner'
-require_relative './runner/thread_context'
-require_relative './runner/test_generator'
-require_relative './test/base'
-require_relative './test/metadata'
-require_relative './version'
-require_relative './reporting/listeners/base'
-require_relative './reporting/listeners/console'
-require_relative './reporting/listeners/console_dots'
-require_relative './reporting/listeners/junit_xml'
-require_relative './reporting/listeners/webui'
-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
-
-  class Cli
-    def self.run(argv)
-
-      tests_metadata = []
-      directories   = argv[:tests]
-      tags          = argv[:tags]
-      filters       = argv[:filters]
-
-      if directories
-        directories.each do |directory|
-          Dir.glob("#{MotoApp::DIR}/tests/#{directory}/**/*.rb").each do |test_path|
-            tests_metadata << Moto::Test::Metadata.new(test_path)
-          end
-        end
-      end
-
-      if tags
-        tests_total = Dir.glob("#{MotoApp::DIR}/tests/**/*.rb")
-        tests_total.each do |test_path|
-
-          metadata = Moto::Test::Metadata.new(test_path)
-          tests_metadata << metadata unless (tags & metadata.tags).empty?
-
-        end
-      end
-
-      # Make sure there are no repetitions in gathered set
-      tests_metadata.uniq! { |metadata| metadata.test_path }
-
-      # Filter tests by provied tags
-      # - test must contain ALL tags specified with -f param
-      # - use ~ for negation
-      # - test may contain other tags
-      if filters
-        filters.each do |filter|
-          filtered = tests_metadata.select do |metadata|
-            next if metadata.tags.empty?
-            filter_matches_any_tag?(filter, metadata.tags) || filter_negation_matches_none_tag?(filter, metadata.tags)
-          end
-          tests_metadata &= filtered
-        end
-      end
-
-      #TODO Display criteria used
-      if tests_metadata.empty?
-        puts 'No tests found for given arguments.'
-        Kernel.exit(-1)
-      end
-
-      # Requires custom initializer if provided by application that uses Moto
-      if File.exists?( "#{MotoApp::DIR}/lib/initializer.rb" )
-        require("#{Moto::DIR}/lib/initializer.rb")
-        require("#{MotoApp::DIR}/lib/initializer.rb")
-        initializer = MotoApp::Lib::Initializer.new(self)
-        initializer.init
-      end
-
-      run_params = {}
-      run_params[:run_name]   = argv[:run_name]
-      run_params[:suite_name] = argv[:suite_name]
-      run_params[:assignee]   = argv[:assignee]
-
-      test_reporter = Moto::Reporting::TestReporter.new(argv[:listeners], run_params)
-
-      if Moto::Lib::Config.moto[:test_runner][:dry_run]
-        runner = Moto::Runner::DryRunner.new(tests_metadata, test_reporter)
-      else
-        runner = Moto::Runner::TestRunner.new(tests_metadata, test_reporter, argv[:stop_on])
-      end
-      runner.run
-    end
-
-    def self.filter_matches_any_tag?(filter, tags)
-      !filter.start_with?('~') && tags.any? { |tag| filter == tag }
-    end
-    private_class_method :filter_matches_any_tag?
-
-    def self.filter_negation_matches_none_tag?(filter, tags)
-      filter.start_with?('~') && tags.none? { |tag| filter[1..-1] == tag }
-    end
-    private_class_method :filter_negation_matches_none_tag?
-
-  end
-end