Merge pull request #90 from pennlabs/laundryfix

Fix laundry and directory tests

penn/laundry.py

@@ -1,10 +1,12 @@
 import re
+import os
 import csv
 import requests
 import pkg_resources
 from bs4 import BeautifulSoup
 
-ALL_URL = 'http://suds.kite.upenn.edu/?location='
+LAUNDRY_DOMAIN = os.environ.get("LAUNDRY_DOMAIN", "suds.kite.upenn.edu")
+ALL_URL = 'http://{}/?location='.format(LAUNDRY_DOMAIN)
 USAGE_BASE_URL = 'https://www.laundryalert.com/cgi-bin/penn6389/LMRoomUsage?CallingPage=LMRoom&Password=penn6389&Halls='
 
 

requirements.txt

@@ -2,4 +2,5 @@ nose==1.3.4
 requests==2.4.3
 beautifulsoup4==4.4.1
 html5lib==0.999
+mock==2.0.0
 nameparser==0.4.0

tests/directory_test.py

@@ -12,24 +12,24 @@ def setUp(self):
         self.dir = directory.Directory(username, password)
 
     def test_lastname_search(self):
-        person = self.dir.detail_search({'last_name':'Domingoes'})['result_data']
+        person = self.dir.detail_search({'last_name': 'Domingoes'})['result_data']
         self.assertEquals(len(person), 1)
         self.assertEquals(person[0]['result_data'][0]['detail_name'], "ADAM W DOMINGOES")
 
     def test_lastname_search_standardized(self):
-        person = self.dir.detail_search({'last_name':'Domingoes'}, standardize=True)['result_data']
+        person = self.dir.detail_search({'last_name': 'Domingoes'}, standardize=True)['result_data']
         self.assertEquals(len(person), 1)
         self.assertEquals(person[0]['result_data'][0]['detail_name'], "Adam W Domingoes")
 
-    # def test_person_id(self):
-    #     # Alex Wissmann's person id
-    #     details = self.dir.person_details('041cd6e739387e24db2483785b87b082')['result_data']
-    #     self.assertEquals(details[0]['detail_name'], "ADAM W DOMINGOES")
+    def test_person_id(self):
+        # Alex Wissmann's person id
+        details = self.dir.person_details('041cd6e739387e24db2483785b87b082')['result_data']
+        self.assertEquals(details[0]['detail_name'], "ADAM W DOMINGOES")
 
-    # def test_person_id_standardized(self):
-    #     # Alex Wissmann's person id
-    #     details = self.dir.person_details('041cd6e739387e24db2483785b87b082', True)['result_data']
-    #     self.assertEquals(details[0]['detail_name'], "Adam W Domingoes")
+    def test_person_id_standardized(self):
+        # Alex Wissmann's person id
+        details = self.dir.person_details('041cd6e739387e24db2483785b87b082', True)['result_data']
+        self.assertEquals(details[0]['detail_name'], "Adam W Domingoes")
 
     def test_faculty_name_not_standardized(self):
         fac = self.dir.search({'first_name': 'kostas'})