[CalendarServer-changes] [7964] CalendarServer/branches/users/glyph/imip-and-admin-html/ calendarserver/webadmin/test/test_resource.py

[source_changes at macosforge.org]

Revision: 7964
          http://trac.macosforge.org/projects/calendarserver/changeset/7964
Author:   glyph at apple.com
Date:     2011-08-11 21:52:09 -0700 (Thu, 11 Aug 2011)
Log Message:
-----------
test for no proxies

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/test/test_resource.py

Modified: CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/test/test_resource.py
===================================================================
--- CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/test/test_resource.py	2011-08-12 04:51:57 UTC (rev 7963)
+++ CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/test/test_resource.py	2011-08-12 04:52:09 UTC (rev 7964)
@@ -214,7 +214,11 @@
             "hdn_resourceId").getAttribute("value")
         self.assertEquals(hiddenResourceId, "qux")
 
+        autoScheduleMenu = document.getElementById("sel_autoSchedule")
+        # Not an auto-schedule resource; there should be no auto-schedule menu.
+        self.assertIdentical(autoScheduleMenu, None)
 
+
     @inlineCallbacks
     def test_davProperty(self):
         """
@@ -310,6 +314,20 @@
         self.assertEquals(lastRowCells[-1].getAttribute("colspan"), "2")
 
 
+    @inlineCallbacks
+    def test_noProxiesListing(self):
+        """
+        When the selected resource principal has no proxies, the page should
+        display a message saying so.
+        """
+        self.resource.getResourceById = partial(FakePrincipalResource, self,
+                                                recordType='resources',
+                                                hasProxies=False)
+        document = yield self.renderPage(dict(resourceId=['qux']))
+        self.assertIn("This resource has no proxies.",
+                      ''.join(gatherTextNodes(document)))
+
+
     # Properties for being a fake directory service as far as the implementation
     # of DirectoryRecord is concerned.
     realmName = 'Fake'
@@ -348,24 +366,21 @@
     def getChild(self, name):
         if name == 'calendar-proxy-read':
             if self.hasProxies:
-                proxyProps = [GroupMemberSet(HRef("read-1"),
-                                             HRef("read-2"),
-                                             HRef("read-3"))]
+                proxyProps = [HRef("read-1"), HRef("read-2"), HRef("read-3")]
             else:
                 proxyProps = []
             return FakePrincipalResource(
                 self.test,
-                extraProperties=proxyProps
+                extraProperties=[GroupMemberSet(*proxyProps)]
             )
         elif name == 'calendar-proxy-write':
             if self.hasProxies:
-                proxyProps = [GroupMemberSet(HRef("write-1"),
-                                             HRef("write-2"))]
+                proxyProps = [HRef("write-1"), HRef("write-2")]
             else:
                 proxyProps = []
             return FakePrincipalResource(
                 self.test,
-                extraProperties=proxyProps
+                extraProperties=[GroupMemberSet(*proxyProps)]
             )
 
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110811/612c41bb/attachment.html>