Use filename option

thatch-health · Feb 13, 2023 · ed29b90 · ed29b90
1 parent 1686ae4
commit ed29b90
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/controllers/blazer/queries_controller.rb b/app/controllers/blazer/queries_controller.rb
@@ -293,7 +293,7 @@ def render_run
           # not ideal, but useful for testing
           raise Error, @error if @error && Rails.env.test?
 
-          send_data csv_data(@columns, @rows, @data_source), type: "text/csv; charset=utf-8; header=present", disposition: "attachment; filename=\"#{@query.try(:name).try(:parameterize).presence || 'query'}.csv\""
+          send_data csv_data(@columns, @rows, @data_source), type: "text/csv; charset=utf-8", disposition: "attachment", filename: "#{@query.try(:name).try(:parameterize).presence || 'query'}.csv"
         end
       end
     end

diff --git a/test/queries_test.rb b/test/queries_test.rb
@@ -118,7 +118,7 @@ def test_smart_columns
   def test_csv
     run_query("SELECT 1 AS id, 'Chicago' AS city", format: "csv")
     assert_equal "id,city\n1,Chicago\n", response.body
-    assert_equal "attachment; filename=\"query.csv\"", response.headers["Content-Disposition"]
+    assert_equal "attachment; filename=\"query.csv\"; filename*=UTF-8''query.csv", response.headers["Content-Disposition"]
     assert_equal "text/csv; charset=utf-8", response.headers["Content-Type"]
   end