From 9d70dbe9a5b174f16aca7c4927f6be5b35262928 Mon Sep 17 00:00:00 2001 From: Mike Moore Date: Tue, 14 Aug 2018 10:22:53 -0600 Subject: [PATCH] Update CSV mime type The mime-types 3.2.0 gem has changed the type for .csv files. --- .../test/google/cloud/bigquery/dataset_load_job_local_test.rb | 4 ++-- .../test/google/cloud/bigquery/dataset_load_local_test.rb | 4 ++-- .../test/google/cloud/bigquery/table_load_job_local_test.rb | 4 ++-- .../test/google/cloud/bigquery/table_load_local_test.rb | 4 ++-- .../test/google/cloud/bigquery/table_reference_test.rb | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/google-cloud-bigquery/test/google/cloud/bigquery/dataset_load_job_local_test.rb b/google-cloud-bigquery/test/google/cloud/bigquery/dataset_load_job_local_test.rb index e730b133bdf0..e478361021f0 100644 --- a/google-cloud-bigquery/test/google/cloud/bigquery/dataset_load_job_local_test.rb +++ b/google-cloud-bigquery/test/google/cloud/bigquery/dataset_load_job_local_test.rb @@ -32,7 +32,7 @@ temp_csv do |file| mock.expect :insert_job, load_job_resp_gapi("some/file/path.csv"), - [project, load_job_gapi(table_reference, "CSV"), upload_source: file, content_type: "text/comma-separated-values"] + [project, load_job_gapi(table_reference, "CSV"), upload_source: file, content_type: "text/csv"] job = dataset.load_job table_id, file, format: :csv job.must_be_kind_of Google::Cloud::Bigquery::LoadJob @@ -46,7 +46,7 @@ temp_csv do |file| mock.expect :insert_job, load_job_resp_gapi("some/file/path.csv"), - [project, load_job_csv_options_gapi(table_reference), upload_source: file, content_type: "text/comma-separated-values"] + [project, load_job_csv_options_gapi(table_reference), upload_source: file, content_type: "text/csv"] job = dataset.load_job table_id, file, format: :csv, jagged_rows: true, quoted_newlines: true, autodetect: true, encoding: "ISO-8859-1", delimiter: "\t", ignore_unknown: true, max_bad_records: 42, null_marker: "\N", diff --git a/google-cloud-bigquery/test/google/cloud/bigquery/dataset_load_local_test.rb b/google-cloud-bigquery/test/google/cloud/bigquery/dataset_load_local_test.rb index 6d5d659aaf04..e15cb8921661 100644 --- a/google-cloud-bigquery/test/google/cloud/bigquery/dataset_load_local_test.rb +++ b/google-cloud-bigquery/test/google/cloud/bigquery/dataset_load_local_test.rb @@ -32,7 +32,7 @@ temp_csv do |file| mock.expect :insert_job, load_job_resp_gapi("some/file/path.csv"), - [project, load_job_gapi(table_reference, "CSV"), upload_source: file, content_type: "text/comma-separated-values"] + [project, load_job_gapi(table_reference, "CSV"), upload_source: file, content_type: "text/csv"] result = dataset.load table_id, file, format: :csv result.must_equal true @@ -46,7 +46,7 @@ temp_csv do |file| mock.expect :insert_job, load_job_resp_gapi("some/file/path.csv"), - [project, load_job_csv_options_gapi(table_reference), upload_source: file, content_type: "text/comma-separated-values"] + [project, load_job_csv_options_gapi(table_reference), upload_source: file, content_type: "text/csv"] result = dataset.load table_id, file, format: :csv, jagged_rows: true, quoted_newlines: true, autodetect: true, encoding: "ISO-8859-1", delimiter: "\t", ignore_unknown: true, max_bad_records: 42, null_marker: "\N", diff --git a/google-cloud-bigquery/test/google/cloud/bigquery/table_load_job_local_test.rb b/google-cloud-bigquery/test/google/cloud/bigquery/table_load_job_local_test.rb index d749c01eb5b5..6e0266e2756c 100644 --- a/google-cloud-bigquery/test/google/cloud/bigquery/table_load_job_local_test.rb +++ b/google-cloud-bigquery/test/google/cloud/bigquery/table_load_job_local_test.rb @@ -30,7 +30,7 @@ temp_csv do |file| mock.expect :insert_job, load_job_resp_gapi(table, "some/file/path.csv"), - [project, load_job_gapi(table_gapi.table_reference, "CSV"), upload_source: file, content_type: "text/comma-separated-values"] + [project, load_job_gapi(table_gapi.table_reference, "CSV"), upload_source: file, content_type: "text/csv"] job = table.load_job file, format: :csv job.must_be_kind_of Google::Cloud::Bigquery::LoadJob @@ -45,7 +45,7 @@ temp_csv do |file| mock.expect :insert_job, load_job_resp_gapi(table, "some/file/path.csv"), - [project, load_job_csv_options_gapi(table_gapi.table_reference), upload_source: file, content_type: "text/comma-separated-values"] + [project, load_job_csv_options_gapi(table_gapi.table_reference), upload_source: file, content_type: "text/csv"] job = table.load_job file, format: :csv, jagged_rows: true, quoted_newlines: true, autodetect: true, encoding: "ISO-8859-1", delimiter: "\t", ignore_unknown: true, max_bad_records: 42, null_marker: "\N", diff --git a/google-cloud-bigquery/test/google/cloud/bigquery/table_load_local_test.rb b/google-cloud-bigquery/test/google/cloud/bigquery/table_load_local_test.rb index 44a6d2c512ea..904aaeb0d233 100644 --- a/google-cloud-bigquery/test/google/cloud/bigquery/table_load_local_test.rb +++ b/google-cloud-bigquery/test/google/cloud/bigquery/table_load_local_test.rb @@ -29,7 +29,7 @@ temp_csv do |file| mock.expect :insert_job, load_job_resp_gapi(table, "some/file/path.csv"), - [project, load_job_gapi(table_gapi.table_reference, "CSV"), upload_source: file, content_type: "text/comma-separated-values"] + [project, load_job_gapi(table_gapi.table_reference, "CSV"), upload_source: file, content_type: "text/csv"] result = table.load file, format: :csv result.must_equal true @@ -44,7 +44,7 @@ temp_csv do |file| mock.expect :insert_job, load_job_resp_gapi(table, "some/file/path.csv"), - [project, load_job_csv_options_gapi(table_gapi.table_reference), upload_source: file, content_type: "text/comma-separated-values"] + [project, load_job_csv_options_gapi(table_gapi.table_reference), upload_source: file, content_type: "text/csv"] result = table.load file, format: :csv, jagged_rows: true, quoted_newlines: true, autodetect: true, encoding: "ISO-8859-1", delimiter: "\t", ignore_unknown: true, max_bad_records: 42, null_marker: "\N", diff --git a/google-cloud-bigquery/test/google/cloud/bigquery/table_reference_test.rb b/google-cloud-bigquery/test/google/cloud/bigquery/table_reference_test.rb index baf7ce9cec5e..6fb605264018 100644 --- a/google-cloud-bigquery/test/google/cloud/bigquery/table_reference_test.rb +++ b/google-cloud-bigquery/test/google/cloud/bigquery/table_reference_test.rb @@ -286,7 +286,7 @@ job_resp_gapi = load_job_resp_gapi(table, "some/file/path.csv") job_resp_gapi.status = status "done" mock.expect :insert_job, job_resp_gapi, - [project, load_job_gapi(table_gapi.table_reference, "CSV", location: nil), upload_source: file, content_type: "text/comma-separated-values"] + [project, load_job_gapi(table_gapi.table_reference, "CSV", location: nil), upload_source: file, content_type: "text/csv"] result = table.load file, format: :csv result.must_equal true