moto 0.0.51 → 0.0.60

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a076c0650fb6ef90310fa2e9ef0f36665c02d7d1
-  data.tar.gz: f1582e2cb2ff664724a89636b26e3850ef03049e
+  metadata.gz: 8bbd84180b2d5e25940cef303e4ab4cfdd7091fb
+  data.tar.gz: ac51475dc79d42081e765e8d5853e2d3214fa579
 SHA512:
-  metadata.gz: a889e5ad07bbb420b3d05f4ad4b1edf357f29c189190f05735de1f0e6d779bbd669615c66cd6da7c57d668b58ff2bca68c3c7f63a2fb513b019283fa44c266b3
-  data.tar.gz: 77e51385da1ae1a87dbafcfdf9e63d81ad134e7790d4456d1f2abc09a312e5ae5fbaf590326586d8c630b2aeabdb108e688b52f3dd0c28010c400425a85dfa98
+  metadata.gz: 7cb7e64acf369eb46c571d31786b57000913237068980446035639b06749e93cdfb185ed5f17758ebf9677b3d23998a1e41ad2f8af393f35a631c0bf8b275c80
+  data.tar.gz: 2d78a9427e12f49c5f6e750203d2756c5d4675dbb8a64e90159176f2825743fbc17de04876a60909ca9e50ad1d63693715138d1d6c29f98e2ed6abc36033b311

data/lib/cli.rb

@@ -77,7 +77,7 @@ module Moto
 
       test_reporter = Moto::Reporting::TestReporter.new(argv[:listeners], argv[:name])
 
-      runner = Moto::Runner::TestRunner.new(test_paths_absolute, argv[:environments], test_reporter)
+      runner = Moto::Runner::TestRunner.new(test_paths_absolute, test_reporter)
       runner.run
     end
 

data/lib/config.rb

@@ -1,16 +1,41 @@
+require 'active_support'
+
 module Moto
   module Lib
     class Config
 
+      # @return [String] String representing the name of the current environment
+      def self.environment
+        @@environment
+      end
+
+      # @param [String] environment Sets a string that will represent environment in configuration, on which
+      #                             various settings will depend, for example env. constants
+      def self.environment=(environment)
+        @@environment = environment
+      end
+
+      # Loads configuration for whole test run and files responsible for environmental constants.
       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)
+          # Try reading constants that are common for all environments
+          begin
+            common_constants = eval(File.read('config/environments/common.rb'))
+          rescue
+            common_constants = {}
           end
 
+          # Try reading constants specific to current environment
+          begin
+            environment_constants = eval(File.read("config/environments/#{@@environment}.rb"))
+          rescue
+            environment_constants = {}
+          end
+
+          @@env_consts = common_constants.deep_merge(environment_constants)
+
         else
           raise "Config file (config/moto.rb) not present.\nDoes current working directory contain Moto application?"
         end
@@ -26,23 +51,18 @@ module Moto
       # @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('')}"
+                 "@@env_consts#{key.split('.').map { |a| "[:#{a}]" }.join('')}"
                else
-                 "@@env_consts['#{key}']"
+                 "@@env_consts[:#{key}]"
                end
 
         begin
-          value = eval code
+          value = eval(code)
           raise if value.nil?
         rescue
-          raise "There is no const defined for key: #{key}. Environment: #{ (env == :__default) ? '<none>' : env }"
+          raise "There is no const defined for key: #{key}."
         end
 
         value

data/lib/parser.rb

@@ -28,17 +28,12 @@ module Moto
     end
 
     def self.run_parse(argv)
-
-      Moto::Lib::Config.load_configuration
-
       require 'bundler/setup'
       Bundler.require
 
       # Default options
       options = {}
       options[:listeners] = []
-      # TODO Mandatory env var in app config
-      options[:environments] = []
       options[:name] = ''
 
       # Parse arguments
@@ -46,7 +41,7 @@ module Moto
         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('-e', '--environment Environment')         { |v| options[:environment] = v }
         opts.on('-n', '--name Name')                       { |v| options[:name] = v }
         # opts.on('-f', '--config Config')                   { |v| options[:config].deep_merge!( eval( File.read(v) ) ) }
       end.parse!
@@ -55,11 +50,15 @@ module Moto
         options[:name] = evaluate_name(options[:tags], options[:tests])
       end
 
-      if Moto::Lib::Config.moto[:test_runner][:mandatory_environment] && options[:environments].empty?
-        puts 'Environment is mandatory for this project.'
+      if !options[:environment]
+        puts 'ERROR: Environment is mandatory.'
         exit 1
+      else
+        Moto::Lib::Config.environment = options[:environment]
+        Moto::Lib::Config.load_configuration
       end
 
+
       return options
     end
 
@@ -105,7 +104,7 @@ module Moto
                          For eg. Tests\Failure\Failure.rb should be passed as Tests::Failure
        -l, --listeners = Reporters to be used.
                          Defaults are Moto::Listeners::ConsoleDots, Moto::Listeners::JunitXml
-       -e, --environment etc etc
+       -e, --environment Mandatory environment. Environment constants and tests parametrized in certain way depend on this.
 
 
       moto generate:

data/lib/runner/test_generator.rb

@@ -7,9 +7,8 @@ module Moto
   module Runner
     class TestGenerator
 
-      def initialize(environments)
+      def initialize
         @internal_counter = 0
-        @environments = environments
       end
 
       # Method returns an array of test instances that represent all variants (parameter sets from test's config).
@@ -23,7 +22,7 @@ module Moto
         test_path_absolute ? variantize(test_path_absolute) : nil
       end
 
-      # Converts test's path to an array of Moto::Base::Test instances that represent all test variants (params, envs)
+      # Converts test's path to an array of Moto::Base::Test instances that represent all test variants (params)
       #
       # *IMPORTANT*
       # Config files with ruby code will be evaluated thus if you use any classes in them
@@ -34,45 +33,41 @@ module Moto
       def variantize(test_path_absolute)
         variants = []
 
-          @environments.each do |env|
-            params_path = test_path_absolute.sub(/\.rb\z/, '')
-
-            if File.exists?(params_path)
-              begin
-                params_all = eval(File.read(params_path))
-              rescue Exception => e
-                # Error will be injected into test.run after test is created
-                params_error = e.message
-                params_all = [{}]
-              end
-            else
+          params_path = test_path_absolute.sub(/\.rb\z/, '')
+
+          if File.exists?(params_path)
+            begin
+              params_all = eval(File.read(params_path))
+            rescue Exception => e
+              # Error will be injected into test.run after test is created
+              params_error = e.message
               params_all = [{}]
             end
+          else
+            params_all = [{}]
+          end
 
-            params_all.each_with_index do |params, params_index|
-
-              # 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? env
-              end
+          params_all.each_with_index do |params, params_index|
 
-              test = generate(test_path_absolute)
-              test.init(env, params, params_index, @internal_counter)
-              test.log_path = "#{test.dir}/logs/#{test.name.gsub(/[^0-9A-Za-z.\-]/, '_')}.log"
-              @internal_counter += 1
+            # 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
 
-              # Error handling, test.run() contents will be swapped with raised exception
-              # so there is an indication in reporters/logs that something went wrong
-              if params_error
-                error_message = "ERROR: Invalid parameters file: #{test.dir}.\n\tMESSAGE: #{params_error}"
-                inject_error_to_test(test, error_message)
-              end
+            test = generate(test_path_absolute)
+            test.init(params, params_index, @internal_counter)
+            test.log_path = "#{test.dir}/logs/#{test.name.gsub(/[^0-9A-Za-z.\-]/, '_')}.log"
+            @internal_counter += 1
 
-              variants << test
+            # Error handling, test.run() contents will be swapped with raised exception
+            # so there is an indication in reporters/logs that something went wrong
+            if params_error
+              error_message = "ERROR: Invalid parameters file: #{test.dir}.\n\tMESSAGE: #{params_error}"
+              inject_error_to_test(test, error_message)
             end
 
-
+            variants << test
           end
 
         variants

data/lib/runner/test_provider.rb

@@ -7,14 +7,13 @@ module Moto
     class TestProvider
 
       # @param [Array] test_paths_absolute
-      # @param [Array] environments Array
-      def initialize(test_paths_absolute, environments)
+      def initialize(test_paths_absolute)
         super()
         @test_repeats = Moto::Lib::Config.moto[:test_runner][:test_repeats]
         @current_test_repeat = 1
         @queue = Queue.new
         @test_paths_absolute = test_paths_absolute
-        @test_generator = TestGenerator.new(environments)
+        @test_generator = TestGenerator.new
       end
 
       # Use this to retrieve tests safely in multithreaded environment

data/lib/runner/test_runner.rb

@@ -8,17 +8,16 @@ module Moto
       attr_reader :logger
       attr_reader :test_reporter
 
-      def initialize(test_paths_absolute, environments, test_reporter)
+      def initialize(test_paths_absolute, test_reporter)
         @test_paths_absolute = test_paths_absolute
         @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)
+        test_provider = TestProvider.new(@test_paths_absolute)
         threads_max = Moto::Lib::Config.moto[:test_runner][:thread_count] || 1
 
         # remove log/screenshot files from previous execution

data/lib/test/base.rb

@@ -27,15 +27,15 @@ module Moto
       end
 
       # Initializes test to be executed with specified params and environment
-      def init(env, params, params_index, global_index)
-        @env = env
+      def init(params, params_index, global_index)
+        @env = Moto::Lib::Config.environment
         @params = params
         @name = generate_name(params_index, global_index)
 
         @status = Moto::Test::Status.new
         @status.name = @name
         @status.test_class_name = self.class.name
-        @status.env = @env
+        @status.env = Moto::Lib::Config.environment
         @status.params = @params
       end
 
@@ -45,15 +45,9 @@ module Moto
       def generate_name(params_index, global_index)
         simple_class_name = self.class.to_s.demodulize
 
-        if @env == :__default
-          return "#{simple_class_name}_#{global_index}" if @params.empty?
-          return "#{simple_class_name}_#{@params[:__name]}_#{global_index}" if @params.key?(:__name)
-          return "#{simple_class_name}_P#{params_index}_#{global_index}" unless @params.key?(:__name)
-        else
-          return "#{simple_class_name}_#{@env}_##{global_index}" if @params.empty?
-          return "#{simple_class_name}_#{@env}_#{@params[:__name]}_#{global_index}" if @params.key?(:__name)
-          return "#{simple_class_name}_#{@env}_P#{params_index}_#{global_index}" unless @params.key?(:__name)
-        end
+        return "#{simple_class_name}_#{@env}_##{global_index}" if @params.empty?
+        return "#{simple_class_name}_#{@env}_#{@params[:__name]}_#{global_index}" if @params.key?(:__name)
+        return "#{simple_class_name}_#{@env}_P#{params_index}_#{global_index}" unless @params.key?(:__name)
 
         self.class.to_s
       end
@@ -156,9 +150,9 @@ module Moto
         if !condition
           if evaled
             # -1 because of added method header in generated class
-            line_number = caller.select { |l| l.match(/\(eval\):\d*:in `run'/) }.first[/\d+/].to_i - 1
+            line_number = caller.select { |l| l.match(/\(eval\):\d*:in `run'/) }.first[/\d+/].to_i
           else
-            line_number = caller.select { |l| l.match(/#{static_path}:\d*:in `run'/) }.first[/\d+/].to_i - 1
+            line_number = caller.select { |l| l.match(/#{static_path}:\d*:in `run'/) }.first[/\d+/].to_i
           end
 
           status.log_failure("ASSERTION FAILED in line #{line_number}: #{message}")
@@ -166,7 +160,7 @@ module Moto
         end
       end
 
-      # Read a constants value from YML configuration files while taking the current execution environment into the account.
+      # Read a constants value from configuration files while taking the 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)

data/lib/version.rb

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

metadata

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