From 57b5e21cdd212c7b2e45adcdb5b771937e52a446 Mon Sep 17 00:00:00 2001
From: Jannis Leidel <jannis@leidel.info>
Date: Thu, 20 Jan 2011 13:03:38 +0100
Subject: [PATCH] Re-enabled previously failing now running test.

---
 compressor/tests/tests.py | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/compressor/tests/tests.py b/compressor/tests/tests.py
index 1342dbe..e1f7189 100644
--- a/compressor/tests/tests.py
+++ b/compressor/tests/tests.py
@@ -98,18 +98,18 @@ class CompressorTestCase(TestCase):
         output = u'<script type="text/javascript" src="/media/CACHE/js/3f33b9146e12.js" charset="utf-8"></script>'
         self.assertEqual(output, self.jsNode.output())
 
-    # def test_custom_output_dir(self):
-    #     old_output_dir = settings.OUTPUT_DIR
-    #     settings.OUTPUT_DIR = 'custom'
-    #     output = u'<script type="text/javascript" src="/media/custom/js/3f33b9146e12.js" charset="utf-8"></script>'
-    #     self.assertEqual(output, JsCompressor(self.js).output())
-    #     settings.OUTPUT_DIR = ''
-    #     output = u'<script type="text/javascript" src="/media/js/3f33b9146e12.js" charset="utf-8"></script>'
-    #     self.assertEqual(output, JsCompressor(self.js).output())
-    #     settings.OUTPUT_DIR = '/custom/nested/'
-    #     output = u'<script type="text/javascript" src="/media/custom/nested/js/3f33b9146e12.js" charset="utf-8"></script>'
-    #     self.assertEqual(output, JsCompressor(self.js).output())
-    #     settings.OUTPUT_DIR = old_output_dir
+    def test_custom_output_dir(self):
+        old_output_dir = settings.OUTPUT_DIR
+        settings.OUTPUT_DIR = 'custom'
+        output = u'<script type="text/javascript" src="/media/custom/js/3f33b9146e12.js" charset="utf-8"></script>'
+        self.assertEqual(output, JsCompressor(self.js).output())
+        settings.OUTPUT_DIR = ''
+        output = u'<script type="text/javascript" src="/media/js/3f33b9146e12.js" charset="utf-8"></script>'
+        self.assertEqual(output, JsCompressor(self.js).output())
+        settings.OUTPUT_DIR = '/custom/nested/'
+        output = u'<script type="text/javascript" src="/media/custom/nested/js/3f33b9146e12.js" charset="utf-8"></script>'
+        self.assertEqual(output, JsCompressor(self.js).output())
+        settings.OUTPUT_DIR = old_output_dir
 
 
 class LxmlCompressorTestCase(CompressorTestCase):