From da722dd51872759751560588fc655893b4cb686a Mon Sep 17 00:00:00 2001
From: Maximilian Krambach <maximilian.krambach@intevation.de>
Date: Fri, 1 Feb 2019 14:20:00 +0100
Subject: [PATCH 1/2] explicitly set mimetype for csv export

---
 client/src/app/core/ui-services/csv-export.service.ts    | 2 +-
 client/src/app/core/ui-services/file-export.service.ts   | 9 +++++++--
 .../agenda-import-list/agenda-import-list.component.ts   | 2 +-
 .../site/motions/services/motion-csv-export.service.ts   | 2 +-
 .../site/motions/services/statute-csv-export.service.ts  | 3 ++-
 .../components/user-import/user-import-list.component.ts | 2 +-
 6 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/client/src/app/core/ui-services/csv-export.service.ts b/client/src/app/core/ui-services/csv-export.service.ts
index 353f8077a..a74735abc 100644
--- a/client/src/app/core/ui-services/csv-export.service.ts
+++ b/client/src/app/core/ui-services/csv-export.service.ts
@@ -154,7 +154,7 @@ export class CsvExportService {
             })
             .join(lineSeparator);
 
-        this.exporter.saveFile(csvContentAsString, filename);
+        this.exporter.saveFile(csvContentAsString, filename, 'text/csv');
     }
 
     /**
diff --git a/client/src/app/core/ui-services/file-export.service.ts b/client/src/app/core/ui-services/file-export.service.ts
index 61d026d70..087195429 100644
--- a/client/src/app/core/ui-services/file-export.service.ts
+++ b/client/src/app/core/ui-services/file-export.service.ts
@@ -14,9 +14,14 @@ export class FileExportService {
      * Saves a file
      * @param file
      * @param filename
+     * @param mimeType an optional mime type
      */
-    public saveFile(file: BlobPart, filename: string): void {
-        const blob = new Blob([file]);
+    public saveFile(file: BlobPart, filename: string, mimeType?: string): void {
+        const options: BlobPropertyBag = {};
+        if (mimeType) {
+            options.type = mimeType;
+        }
+        const blob = new Blob([file], options);
         saveAs(blob, filename, { autoBOM: true });
         // autoBOM = automatic byte-order-mark
     }
diff --git a/client/src/app/site/agenda/components/agenda-import-list/agenda-import-list.component.ts b/client/src/app/site/agenda/components/agenda-import-list/agenda-import-list.component.ts
index 8714a7950..b96cdd19f 100644
--- a/client/src/app/site/agenda/components/agenda-import-list/agenda-import-list.component.ts
+++ b/client/src/app/site/agenda/components/agenda-import-list/agenda-import-list.component.ts
@@ -112,7 +112,7 @@ export class AgendaImportListComponent extends BaseImportListComponent<ViewCreat
             'Break,,0:10,,internal',
             'Demo 2,Demo text 2,1:30,,hidden'
         ];
-        this.exporter.saveFile(rows.join('\n'), this.translate.instant('Topic example') + '.csv');
+        this.exporter.saveFile(rows.join('\n'), this.translate.instant('Topic example') + '.csv', 'text/csv');
     }
 
     /**
diff --git a/client/src/app/site/motions/services/motion-csv-export.service.ts b/client/src/app/site/motions/services/motion-csv-export.service.ts
index b919c7027..b9b5eb224 100644
--- a/client/src/app/site/motions/services/motion-csv-export.service.ts
+++ b/client/src/app/site/motions/services/motion-csv-export.service.ts
@@ -75,6 +75,6 @@ export class MotionCsvExportService {
             'B1,Title 2,Text 2,Reason 2,Submitter B, Category B,, Block A',
             ',Title 3, Text 3,,,,,'
         ];
-        this.fileExport.saveFile(rows.join('\n'), this.translate.instant('motions-example') + '.csv');
+        this.fileExport.saveFile(rows.join('\n'), this.translate.instant('motions-example') + '.csv', 'text/csv');
     }
 }
diff --git a/client/src/app/site/motions/services/statute-csv-export.service.ts b/client/src/app/site/motions/services/statute-csv-export.service.ts
index ba56e2a50..308c13cc2 100644
--- a/client/src/app/site/motions/services/statute-csv-export.service.ts
+++ b/client/src/app/site/motions/services/statute-csv-export.service.ts
@@ -52,7 +52,8 @@ export class StatuteCsvExportService {
         ];
         this.fileExport.saveFile(
             rows.join('\n'),
-            `${this.translate.instant('Statutes')} - ${this.translate.instant('example')}.csv`
+            `${this.translate.instant('Statutes')} - ${this.translate.instant('example')}.csv`,
+            'text/csv'
         );
     }
 }
diff --git a/client/src/app/site/users/components/user-import/user-import-list.component.ts b/client/src/app/site/users/components/user-import/user-import-list.component.ts
index c6ab50c96..d59ade6c3 100644
--- a/client/src/app/site/users/components/user-import/user-import-list.component.ts
+++ b/client/src/app/site/users/components/user-import/user-import-list.component.ts
@@ -69,7 +69,7 @@ export class UserImportListComponent extends BaseImportListComponent<ViewUser> {
             ',Fred,Bloggs,London,,,,,,,,',
             ',,Executive Board,,,,,,,1,,'
         ];
-        this.exporter.saveFile(rows.join('\n'), this.translate.instant('participants-example') + '.csv');
+        this.exporter.saveFile(rows.join('\n'), this.translate.instant('participants-example') + '.csv', 'text/csv');
     }
 
     /**

From 3d7b833eeb667e659827626437afd025abb8f6e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emanuel=20Sch=C3=BCtze?= <emanuel@intevation.de>
Date: Fri, 1 Feb 2019 14:28:34 +0100
Subject: [PATCH 2/2] Fix travis by downgrading pytest to <4.2.0

---
 requirements/development.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements/development.txt b/requirements/development.txt
index cbb1411e4..a3c0c03f2 100644
--- a/requirements/development.txt
+++ b/requirements/development.txt
@@ -3,7 +3,7 @@ coverage
 flake8
 isort
 mypy
-pytest
+pytest<4.2.0
 pytest-django
 pytest-asyncio
 pytest-cov