Changeset 6539

Timestamp:

02/11/08 13:04:48 (5 years ago)

Author:

walf443

Message:

lang/ruby/rspec-fixture:

• fix a bug that is 'not converting collectly :msg in description template'.
  
• add spec-fixture-base spec.
  

Location:

lang/ruby/rspec-fixture/trunk

Files:

• lib/spec/fixture/base.rb (modified) (1 diff)
• spec/spec-fixture-base_spec.rb (added)

lang/ruby/rspec-fixture/trunk/lib/spec/fixture/base.rb

@@ -39 +39 @@
       msg = @desc_template
       [ fxt._members, :msg ].flatten.each do |item|
-        result = fxt.value_of[item]
-        if @desc_filter_of && @desc_filter_of[item]
-          if @desc_filter_of[item].kind_of? Proc
-            result = @desc_filter_of[item].call(result)
+        if item == :msg
+          result = fxt.msg.to_s
+        else
+          result = fxt.value_of[item]
+          if @desc_filter_of && @desc_filter_of[item]
+            if @desc_filter_of[item].kind_of? Proc
+              result = @desc_filter_of[item].call(result)
+            else
+              [ @desc_filter_of[item] ].flatten.each do |meth|
+                result = result.__send__ meth
+              end
+            end
           else
-            [ @desc_filter_of[item] ].flatten.each do |meth|
-              result = result.__send__ meth
-            end
+            result = result.inspect
           end
-        else
-          result = (item == :msg ) ? result.to_s : result.inspect
         end
         msg = msg.gsub(/:#{item.to_s}/, result)