moto 0.0.43 → 0.0.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dff85ce0c564b05532a1515160b8bd9fde071699
-  data.tar.gz: c9581f3c290bdfc0360928f9e8fd7ddb19a42351
+  metadata.gz: 712047197c8132ea6944a4b7d4e0a763c466cfb7
+  data.tar.gz: 9349d3865b94a4ffe5c271436fdc3b76bf5045e0
 SHA512:
-  metadata.gz: 373a68b8f9029b4c8a5b1e58503732ca45f7f1b6076b9260b8df7f01d84c8a068c1c82131739715b2cc38cfaf347d6f98498f7b2bf71a3521cffbf4273a8a411
-  data.tar.gz: 686f35af91c02ce7693e6f8ceb63135bf72abd982f8026e835c032e2f11ef98fd0137dc15d242bd5e9bdb55143f81028bd69460abebd40a6c88d0f7213f635c8
+  metadata.gz: e1e8260a7dc2c7d7836bb31270f80273aad5023952f8f301a1a9cb7969f8bf712f5b18ebd402a27ad92c305cebbc6d7bd1a055ea0b135050ed0584b2dfa4ec2f
+  data.tar.gz: e834cbc0b9c689e9e71bc6d82f3c52db2a53e4a72fe109c0629f3169048875721bcf6740e1b227a5c9cd8ba914b767bf27fd1c0e7360861d83e5f6eed4493195

data/lib/runner/test_generator.rb

@@ -41,7 +41,9 @@ module Moto
               begin
                 params_all = eval(File.read(params_path))
               rescue Exception => e
-                puts "Parameters error:\n\t File:  #{params_path}\n\t Error: #{e.message}\n\n"
+                # Error will be injected into test.run after test is created
+                params_error = e.message
+                params_all = [{}]
               end
             else
               params_all = [{}]
@@ -59,8 +61,18 @@ module Moto
               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
+
+              # 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
+
+
           end
 
         variants
@@ -92,8 +104,6 @@ module Moto
           # no need to handle it here, next begin/rescue clause in this function will finish the job
         end
 
-        test_object = nil
-
         # 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.
@@ -104,15 +114,8 @@ module Moto
           class_name = Moto::Test::Base
           test_object = class_name.new
 
-          class << test_object
-            attr_accessor :custom_name
-
-            def run
-              raise "ERROR: Invalid module structure: #{custom_name}"
-            end
-          end
-
-          test_object.custom_name = test_path_absolute.gsub("#{MotoApp::DIR}/", 'moto_app/').camelize.chomp('.rb')
+          error_message = "ERROR: Invalid module structure: #{test_path_absolute.gsub("#{MotoApp::DIR}/", 'moto_app/').camelize.chomp('.rb')}"
+          inject_error_to_test(test_object, error_message)
         end
 
         test_object.static_path = test_path_absolute
@@ -166,6 +169,21 @@ 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/version.rb

@@ -1,3 +1,3 @@
 module Moto
-  VERSION = '0.0.43'
+  VERSION = '0.0.44'
 end

metadata

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