lib/minitest/data.rb in minitest-data-0.1.0 vs lib/minitest/data.rb in minitest-data-0.2.0

@@ -60,39 +60,32 @@
         end
       end
 
       attr_accessor :data_label, :data_attribute
 
-      def location
-        label_string = ""
-        label_string = "(#{self.data_label})" if self.data_label
-        loc = " [#{self.failure.location}]" unless passed? or error?
-        "#{self.class}##{self.name}#{label_string}#{loc}"
-      end
-
       def run
-        with_info_handler do
-          time_it do
-            capture_exceptions do
-              before_setup; setup; after_setup
+        time_it do
+          capture_exceptions do
+            Minitest::Test::SETUP_METHODS.each do |hook|
+              self.send hook
+            end
 
-              if data_attribute
-                self.send self.name, data_attribute
-              else
-                self.send self.name
-              end
+            if data_attribute
+              self.send self.name, data_attribute
+            else
+              self.send self.name
             end
+          end
 
-            Minitest::Test::TEARDOWN_METHODS.each do |hook|
-              capture_exceptions do
-                self.send hook
-              end
+          Minitest::Test::TEARDOWN_METHODS.each do |hook|
+            capture_exceptions do
+              self.send hook
             end
           end
         end
 
-        self
+        Minitest::Result.from self
       end
     end
 
 
     class << self
@@ -109,17 +102,45 @@
           test_klass = klass.new(method_name)
           test_klass.data_label = label
           test_klass.data_attribute = value
 
           result = test_klass.run
-          raise "#{klass}#run _must_ return self" unless klass === result
+          raise "#{klass}#run _must_ return self" unless Minitest::Result === result
           result
         else
           super(klass, method_name)
         end
       end
     end
+
+    module Result
+      attr_accessor :data_label
+
+      class << self
+        def prepended(klass)
+          class << klass
+            prepend ClassMethods
+          end
+        end
+      end
+
+      module ClassMethods
+        def from(runnable)
+          r = super
+          r.data_label = runnable.data_label if defined?(runnable.data_label)
+          r
+        end
+      end
+
+      def location
+        label_string = ""
+        label_string = "(#{self.data_label})" if self.data_label
+        loc = " [#{self.failure.location.delete_prefix Minitest::Reportable::BASE_DIR}]" unless passed? or error?
+        "#{self.class}##{self.name}#{label_string}#{loc}"
+      end
+    end
   end
 end
 
 Minitest::Test.prepend(Minitest::Data::Test)
+Minitest::Result.prepend(Minitest::Data::Result)
 Minitest.prepend(Minitest::Data)