From eaefa09c7ef749906cc1bac7f8deb005c55eb006 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Wed, 19 Feb 2020 15:55:24 +0530 Subject: [PATCH] tests: Fix failing tests --- frappe/core/doctype/data_import/exporter_new.py | 1 + frappe/core/doctype/data_import/importer_new.py | 2 +- frappe/core/doctype/data_import/test_exporter_new.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/frappe/core/doctype/data_import/exporter_new.py b/frappe/core/doctype/data_import/exporter_new.py index bcf20a31a7..e8e360dc50 100644 --- a/frappe/core/doctype/data_import/exporter_new.py +++ b/frappe/core/doctype/data_import/exporter_new.py @@ -96,6 +96,7 @@ class Exporter: "parent": doctype, } ) + all_fields = [name_field] + all_fields if self.export_fields == "Mandatory": fields = [df for df in all_fields if df.reqd] diff --git a/frappe/core/doctype/data_import/importer_new.py b/frappe/core/doctype/data_import/importer_new.py index 51ae0525f6..e12ad9925f 100644 --- a/frappe/core/doctype/data_import/importer_new.py +++ b/frappe/core/doctype/data_import/importer_new.py @@ -325,7 +325,7 @@ class Importer: def detect_date_formats(self, columns): for col in columns: - if col.df.fieldtype in ['Date', 'Time', 'Datetime']: + if col.df and col.df.fieldtype in ['Date', 'Time', 'Datetime']: col.date_format = self.guess_date_format_for_column(col, columns) return columns diff --git a/frappe/core/doctype/data_import/test_exporter_new.py b/frappe/core/doctype/data_import/test_exporter_new.py index ccee0472d5..7464d6edc5 100644 --- a/frappe/core/doctype/data_import/test_exporter_new.py +++ b/frappe/core/doctype/data_import/test_exporter_new.py @@ -30,7 +30,7 @@ class TestExporter(unittest.TestCase): e = Exporter('Web Page', export_fields=export_fields) csv_array = e.get_csv_array() header = csv_array[0] - self.assertEqual(header, ['ID', 'Title', 'Route', 'Published']) + self.assertEqual(header, ['Title', 'Route', 'Published']) def test_exports_data(self):