moto 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be0991718ac695d0b5b90b955f896fe52472b982
-  data.tar.gz: 5a979cb0d173620014ee1c765bd1613c42d0c227
+  metadata.gz: b7dfa94193904de4da842adb7573c6cf154561fc
+  data.tar.gz: 38d2d4a3ae5d5c540fe8fbdbd7c0d5cba4ffd846
 SHA512:
-  metadata.gz: 219808323dfc15c7046c2f29759907df267345b4839aeaaebd9f3f4c5397c199e20a49c37420a3b5de4ba0eaa6cc06219d9723bde4d9da8b857e6d45902d306f
-  data.tar.gz: 97ceabe6d63dc2c1275e295fbae4a8bc4aeb567d0cdda684655e686f6ee71e7c97696365657bfea8f805a21da96a8d555c6324717a087475d7d8d34aee22f18e
+  metadata.gz: a1e9dab5e33f38f0ffaadba500774002b150d84d84975e71aa8b69daddc6d067c07e82df61cfd0c613e51f8a1c2e6d7d66c25931df9530c3b3d381a61e1a0e32
+  data.tar.gz: f84bf1d784121556b2f3337b52b8f7dec44fc633742f0a71070a71460468a09903cf35f7de279d283f42eecdf5db299440ce8e002d16d09ac8d6aa488668a620

data/lib/cli.rb

@@ -39,6 +39,7 @@ module Moto
     def self.run(argv)
       test_paths_absolute = []
 
+      #TODO Remove providing an array ?
       unless argv[ :tests ].nil?
         argv[ :tests ].each do |dir_name|
           test_paths = Dir.glob("#{MotoApp::DIR}/tests/#{dir_name}/**/*.rb")
@@ -47,7 +48,7 @@ module Moto
         end
       end
 
-      # TODO Optimization for files without #MOTO_TAGS
+      # TODO Optimization for files without #MOTO_TAGS - add support for tags in params (not here)
       unless argv[:tags].nil?
         tests_total = Dir.glob("#{MotoApp::DIR}/tests/**/*.rb")
         tests_total.each do |test_path|

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/parser.rb

@@ -100,9 +100,10 @@ module Moto
       moto --version Display current version
 
       moto run:      
-       -t, --tests     = Tests to be executed.
-                         For eg. Tests\Failure\Failure.rb should be passed as Tests::Failure
-       -l, --listeners = Reporters to be used.
+       -t, --tests       Tests to be executed.
+       -g, --tags        Tags of tests to be executed.
+                         Use # MOTO_TAGS: TAGNAME in test to assign tag.
+       -l, --listeners   Reporters to be used.
                          Defaults are Moto::Listeners::ConsoleDots, Moto::Listeners::JunitXml
        -e, --environment Mandatory environment. Environment constants and tests parametrized in certain way depend on this.
        -c, --config      Name of the config, without extension, to be loaded from MotoApp/config/CONFIG_NAME.rb
@@ -110,18 +111,18 @@ module Moto
 
 
       moto generate:
-       -t, --test      = Path and name of the test to be created.
+       -t, --test        Path and name of the test to be created.
                          Examples:
                          -ttest_name          will create MotoApp/tests/test_name/test_name.rb
                          -tdir/test_name      will create MotoApp/tests/dir/test_name/test_name.rb
-       -a, --appname   = Name of the application. Will be also used as topmost module in test file.
+       -a, --appname     Name of the application. Will be also used as topmost module in test file.
                          Default: MotoApp
-       -b, --baseclass = File, without extension, with base class from which test will derive. Assumes one class per file.
+       -b, --baseclass   File, without extension, with base class from which test will derive. Assumes one class per file.
                          Examples:
                          -btest_base          will use the file in MotoApp/lib/test/test_base.rb
                          -bsubdir/test_base   will use the file in MotoApp/lib/test/subdir/test_base.rb
                          By default class will derive from Moto::Test
-       -f, --force     = Forces generator to overwrite previously existing class file in specified location.
+       -f, --force       Forces generator to overwrite previously existing class file in specified location.
                          You have been warned.
       """
     end

data/lib/runner/test_generator.rb

@@ -33,40 +33,28 @@ module Moto
       def variantize(test_path_absolute)
         variants = []
 
-          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
+          # TODO CHANGED TEMPORARY
+          #params_path = test_path_absolute.sub(/\.rb\z/, '')
+          params_directory = File.dirname(test_path_absolute).to_s + '/params/**'
+          param_files_paths = Dir.glob(params_directory)
+          param_files_paths = [nil] if param_files_paths.empty?
 
-          params_all.each_with_index do |params, params_index|
+          #TODO Fix
+          param_files_paths.each_with_index do |params_path, params_index|
 
+            #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
+            # 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_path_absolute)
-            test.init(params, params_index, @internal_counter)
-            test.log_path = "#{test.dir}/logs/#{test.name.gsub(/[^0-9A-Za-z.\-]/, '_')}.log"
+            test.init(params_path, params_index, @internal_counter)
+            test.log_path = "#{File.dirname(test_path_absolute).to_s}/logs/#{test.name.gsub(/[^0-9A-Za-z.\-]/, '_')}.log"
             @internal_counter += 1
 
-            # 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
 
@@ -157,21 +145,6 @@ module Moto
       end
       private :generate_for_run_body
 
-      # 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
-      # @param [String] error_message Message to be attached to the raised exception
-      def inject_error_to_test(test, error_message)
-        class << test
-          attr_accessor :injected_error_message
-
-          def run
-            raise injected_error_message
-          end
-        end
-
-        test.injected_error_message = error_message
-      end
-
     end
   end
 end

data/lib/runner/thread_context.rb

@@ -51,8 +51,8 @@ module Moto
           Thread.current['logger'].info("Result: #{@test.status.results.last.code}")
 
           # test should have another attempt in case of an error / failure / none at all
-          if !(@test.status.results.last.code == Moto::Test::Result::ERROR   && config[:test_reattempt_on_error]) &&
-             !(@test.status.results.last.code == Moto::Test::Result::FAILURE && config[:test_reattempt_on_fail] )
+          unless (@test.status.results.last.code == Moto::Test::Result::ERROR   && config[:test_reattempt_on_error]) ||
+                 (@test.status.results.last.code == Moto::Test::Result::FAILURE && config[:test_reattempt_on_fail] )
             break
           end
 

data/lib/test/base.rb

@@ -24,31 +24,18 @@ module Moto
       end
 
       # Initializes test to be executed with specified params and environment
-      def init(params, params_index, global_index)
+      def init(params_path, params_index, global_index)
         @env = Moto::Lib::Config.environment
-        @params = params
-        @name = generate_name(params_index, global_index)
-
+        @params = []
+        @params_path = params_path
+        #TODO Display name
+        @name = self.class.to_s.demodulize
+        @name += "_#{@params_path.split("/")[-1].chomp('.param')}" if @params_path
         @status = Moto::Test::Status.new
         @status.name = @name
         @status.test_class_name = self.class.name
         @status.env = Moto::Lib::Config.environment
-        @status.params = @params
-      end
-
-      # Generates name of the test based on its properties:
-      #  - number/name of currently executed configuration run
-      #  - env
-      def generate_name(params_index, global_index)
-        simple_class_name = self.class.to_s.demodulize
-
-        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
-      private :generate_name
 
       # Setter for :log_path
       def log_path=(param)
@@ -64,21 +51,30 @@ module Moto
         @log_path
       end
 
-      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
+      #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
         status.initialize_run
 
+        #TODO Formatting/optimization
+        begin
+          @params = eval(File.read(@params_path)) if File.exists?(@params_path.to_s)
+          @status.params = @params
+        rescue Exception => exception
+          raise "ERROR: Invalid parameters file: #{@params_path}.\n\tMESSAGE: #{exception.message}"
+        end
+
         begin
           run
         rescue Exception => exception

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Moto
-  VERSION = '0.7.2'
+  VERSION = '0.7.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moto
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Bartek Wilczek
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-01 00:00:00.000000000 Z
+date: 2016-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport