Merge 4f7dc78 into e216b36

selenide · May 10, 2018 · b340f13 · b340f13
2 parents e216b36 + 4f7dc78
commit b340f13
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/main/java/com/codeborne/selenide/impl/HttpHelper.java b/src/main/java/com/codeborne/selenide/impl/HttpHelper.java
@@ -11,7 +11,7 @@
 
 public class HttpHelper {
 
-  private final Pattern pattern = Pattern.compile(".*filename\\*?=\"?((.+)'')?([^\";]*)\"?(;charset=(.*))?.*", CASE_INSENSITIVE);
+  private final Pattern pattern = Pattern.compile(".*filename\\*?=\"?((.+)'')?([^\";?]*)\"?(;charset=(.*))?.*", CASE_INSENSITIVE);
 
   public Optional<String> getFileNameFromContentDisposition(String headerName, String headerValue) {
     if (!"Content-Disposition".equalsIgnoreCase(headerName) || headerValue == null) {

diff --git a/src/test/java/com/codeborne/selenide/impl/HttpHelperTest.java b/src/test/java/com/codeborne/selenide/impl/HttpHelperTest.java
@@ -19,6 +19,12 @@ public void extractsFileNameFromHttpHeader() {
     assertEquals("selenide-2.6.1.jar", helper.getFileNameFromContentDisposition(
         "content-disposition", "attachement; filename=selenide-2.6.1.jar").get());
 
+    assertEquals("selenide-4.11.5.md", helper.getFileNameFromContentDisposition(
+        "Content-Disposition", "attachement; filename=selenide-4.11.5.md?sessioncookie=12345%2323").get());
+
+    assertEquals("random_file.txt", helper.getFileNameFromContentDisposition(
+        "Content-Disposition", "attachement; filename=random_file.txt?auth=5v1kij42xXSsc;charset=CP1251").get());
+
     assertEquals("Prices.csv", helper.getFileNameFromContentDisposition(
         "Content-Disposition", "attachment; filename=Prices.csv;charset=UTF-8").get());