moto 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3799edbb3011aab7abc3f801548862865d5dc196
-  data.tar.gz: 49183582720dd86f5f1fd4335a5e5ca3d9228731
+  metadata.gz: 9faf48b6aac417fb55e2e7c7c1ed2392574d47ae
+  data.tar.gz: 9ac15868017a3e95b9c0f55221a713addf613ae1
 SHA512:
-  metadata.gz: 49c6e8a0e15ee3275fced887be1e25296be84dedf652e54f372040b1d5b8fe55593efe32a0b659a3a707d4b3289491b0bff10a77c741decdc4b003491164335d
-  data.tar.gz: 32d7e271f59cbdbc46f8712b5ef2bc0c141f38057c1a633fc8f85c7f679f5799065390d9965810939d0a249fdec6894314bf73811004d9f55d317a77ce6e667c
+  metadata.gz: c7a8906b2259c776a492143c668c55d485a44c062befd7f4a94163eda025dd948ca341e7f9becf4b4190e449213aff0b26a4a1379820c5b4c1a2529358b9aad9
+  data.tar.gz: 5addd188da1b850ae65d861fd3117a20f2743022ed3b34aae798241e2e89f8fec1dae4f9a1d0d7ccad4cae79adcfc7b3c05cb070def6d7ee97076266de713841

data/lib/assert.rb

@@ -11,7 +11,13 @@ module Moto
 
     def assert(condition, message)
       unless condition
-        line_number = caller.select{ |l| l.match(/\(eval\):\d*:in `run'/) }.first[/\d+/].to_i - 1 # -1 because of added method header in generated class
+        
+        line_number = if @context.current_test.evaled 
+          caller.select{ |l| l.match(/\(eval\):\d*:in `run'/) }.first[/\d+/].to_i - 1 # -1 because of added method header in generated class
+        else
+          line_number = caller.select{ |l| l.match(/#{@context.current_test.static_path}:\d*:in `run'/) }.first[/\d+/].to_i - 1
+        end
+
         full_message = "ASSERTION FAILED in line #{line_number}: #{message}"
         @context.runner.result.add_failure(self, full_message)
         logger.error(full_message)

data/lib/test.rb

@@ -9,8 +9,9 @@ module Moto
     attr_reader :name
     attr_reader :env
     attr_reader :params
-    attr_writer :static_path
+    attr_accessor :static_path
     attr_accessor :log_path
+    attr_accessor :evaled
 
     class << self
       attr_accessor :_path

data/lib/test_generator.rb

@@ -38,6 +38,25 @@ module Moto
     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
+    
+    def generate_for_full_class_code(test_path_absolute)
+      require test_path_absolute
+      class_name = test_path_absolute.gsub("#{MotoApp::DIR}/",'moto_app/').split('/')[0..-2].join('/').camelize
+      test_object = class_name.constantize.new
+      test_object.static_path = test_path_absolute
+      test_object.evaled = false
+      test_object      
+    end
+    
+    def generate_for_run_body(test_path_absolute, method_body)
       base = Moto::Test
       base_class_string = method_body.match( /^#\s*BASE_CLASS:\s(\S+)/ )
       unless base_class_string.nil?
@@ -62,6 +81,7 @@ module Moto
       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
     

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Moto
-  VERSION = '0.0.18'
+  VERSION = '0.0.19'
 end

metadata

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