lib/teaspoon/formatter/base.rb in teaspoon-1.0.2 vs lib/teaspoon/formatter/base.rb in teaspoon-1.1.0

@@ -1,8 +1,10 @@
 module Teaspoon
   module Formatter
     class Base
+      RESERVED_PARAMS = ["body", "instrument"]
+
       attr_accessor :total_count, :run_count, :passes, :pendings, :failures, :errors
 
       def initialize(suite_name = :default, output_file = nil)
         @suite_name  = suite_name.to_s
         @output_file = output_file
@@ -140,10 +142,17 @@
       def pluralize(str, value)
         value == 1 ? "#{value} #{str}" : "#{value} #{str}s"
       end
 
       def filename(file)
-        file.gsub(%r(^http://127.0.0.1:\d+/assets/), "").gsub(/[\?|&]?body=1/, "")
+        uri = URI(file)
+        params = uri.query.split("&").reject do |param|
+          RESERVED_PARAMS.include?(param.split("=").first)
+        end
+
+        filename = uri.path.sub(%r(^/assets/), "")
+        filename += "?#{params.join("&")}" if params.any?
+        filename
       end
     end
   end
 end