From e13bc902117f53a9e51b6a7395a7e58686352365 Mon Sep 17 00:00:00 2001
From: Darshit Shah <darnir@gmail.com>
Date: Thu, 5 Sep 2013 00:24:58 +0530
Subject: [PATCH] Add new test to ensure Content Disposition and Auth work
 together

---
 testenv/ChangeLog                             |  6 +++
 testenv/Makefile.am                           |  1 +
 testenv/Test-auth-with-content-disposition.py | 53 +++++++++++++++++++
 3 files changed, 60 insertions(+)
 create mode 100755 testenv/Test-auth-with-content-disposition.py

diff --git a/testenv/ChangeLog b/testenv/ChangeLog
index e9df0a23..9a4b3fc5 100644
--- a/testenv/ChangeLog
+++ b/testenv/ChangeLog
@@ -1,3 +1,9 @@
+2013-09-05  Darshit Shah  <darnir@gmail.com>
+
+	* Test-auth-with-content-disposition.py: Add test that ensures Content
+	Disposition works alongwith authentication
+	* Makefile.am: Add new test
+
 2013-09-04  Darshit Shah  <darnir@gmail.com>
 
 	* Test-c-full.py: Test Continue options
diff --git a/testenv/Makefile.am b/testenv/Makefile.am
index 85fd41fb..d8cd8a1f 100644
--- a/testenv/Makefile.am
+++ b/testenv/Makefile.am
@@ -35,6 +35,7 @@ TESTS = Test-auth-basic-fail.py			\
 	Test-auth-no-challenge.py		\
 	Test-auth-no-challenge-url.py		\
 	Test-auth-retcode.py			\
+	Test-auth-with-content-disposition.py	\
 	Test-c-full.py				\
 	Test-Content-disposition-2.py		\
 	Test-Content-disposition.py 		\
diff --git a/testenv/Test-auth-with-content-disposition.py b/testenv/Test-auth-with-content-disposition.py
new file mode 100755
index 00000000..d39a9fa1
--- /dev/null
+++ b/testenv/Test-auth-with-content-disposition.py
@@ -0,0 +1,53 @@
+#!/usr/bin/env python3
+from sys import exit
+from WgetTest import HTTPTest, WgetFile
+
+"""
+    This test ensures that Wget handles Content-Disposition correctly when
+    coupled with Authentication
+"""
+TEST_NAME = "Authentication with Content Disposition"
+############# File Definitions ###############################################
+File1 = "Need a cookie?"
+
+File1_rules = {
+    "Authentication"    : {
+        "Type"          : "Basic",
+        "User"          : "Pacman",
+        "Pass"          : "Omnomnom"
+    },
+    "SendHeader"        : {
+        "Content-Disposition" : "Attachment; filename=Arch"
+    }
+}
+A_File = WgetFile ("File1", File1, rules=File1_rules)
+
+WGET_OPTIONS = "-d --user=Pacman --password=Omnomnom --content-disposition"
+WGET_URLS = ["File1"]
+
+Files = [A_File]
+
+ExpectedReturnCode = 0
+ExpectedDownloadedFiles = [WgetFile ("Arch", File1)]
+
+################ Pre and Post Test Hooks #####################################
+pre_test = {
+    "ServerFiles"       : Files
+}
+test_options = {
+    "WgetCommands"      : WGET_OPTIONS,
+    "Urls"              : WGET_URLS
+}
+post_test = {
+    "ExpectedFiles"     : ExpectedDownloadedFiles,
+    "ExpectedRetcode"   : ExpectedReturnCode
+}
+
+err = HTTPTest (
+                name=TEST_NAME,
+                pre_hook=pre_test,
+                test_params=test_options,
+                post_hook=post_test
+).begin ()
+
+exit (err)