Index: /main/waeup.aaue/trunk/src/waeup/aaue/students/tests/test_browser.py
===================================================================
--- /main/waeup.aaue/trunk/src/waeup/aaue/students/tests/test_browser.py	(revision 17550)
+++ /main/waeup.aaue/trunk/src/waeup/aaue/students/tests/test_browser.py	(revision 17551)
@@ -1210,5 +1210,5 @@
         # All beds can be assigned
         bed1 = self.app['hostels']['hall-1']['hall-1_A_101_A']
-        bed1.bed_type = u'regular_male_all'
+        bed1.bed_type = u'regular_male_fr'
         bed2 = self.app['hostels']['hall-1']['hall-1_A_101_B']
         bed2.bed_type = u'regular_female_all'
@@ -1220,5 +1220,4 @@
         self.browser.getControl(name="form.password").value = 'spwd'
         self.browser.getControl("Login").click()
-        # Students can book accommodation without AC ...
         self.browser.open(self.acco_path)
         IWorkflowInfo(self.student).fireTransition('admit')
@@ -1234,11 +1233,27 @@
             in self.browser.contents)
         IWorkflowState(self.student).setState(PAID)
+
+        self.browser.getLink("Payments").click()
+        self.browser.getLink("Add current session payment ticket").click()
+        self.browser.getControl(name="form.p_category").value = ['bed_allocation']
+        self.browser.getControl("Create ticket").click()
+        self.student['payments'].values()[0].approveStudentPayment()
+        pin = self.app['accesscodes']['HOS-0'].keys()[0]
+        ac = self.app['accesscodes']['HOS-0'][pin]
+        parts = pin.split('-')[1:]
+        sfeseries, sfenumber = parts
+        self.browser.open(self.acco_path)
         self.browser.getControl("Book accommodation").click()
         #self.assertFalse('Activation Code:' in self.browser.contents)
+
+        self.assertMatches('...Activation Code:...',
+                           self.browser.contents)
+        self.browser.getControl(name="ac_series").value = sfeseries
+        self.browser.getControl(name="ac_number").value = sfenumber
         self.browser.getControl("Create bed ticket").click()
         # Bed is randomly selected but, since there is only
         # one bed for this student, we know that
         self.assertEqual(self.student['accommodation']['2004'].bed_coordinates,
-            'Hall 1, Block A, Room 101, Bed A (regular_male_all)')
+            'Hall 1, Block A, Room 101, Bed A (regular_male_fr)')
         # Only the hall name is displayed
         self.assertEqual(self.student[
