Changeset 9740 for main/waeup.kofa/trunk/src/waeup/kofa

Timestamp:

30 Nov 2012, 07:01:34 (12 years ago)

Author:

Henrik Bettermann

Message:

Adjust tests to the new filterstudents pages. The buttons now redirect to these pages.

ToDo?: Course Advisers should not be able to select the level.

Location:

main/waeup.kofa/trunk/src/waeup/kofa

Files:

• browser/viewlets.py (modified) (3 diffs)
• students/tests/test_browser.py (modified) (2 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/browser/viewlets.py

@@ -445 +445 @@
     icon = 'actionicon_student.png'
     text = _('Show students')
-    target = 'showdepstudents'
+    target = 'students'
 
 class ManageCourseActionButton(ManageActionButton):
@@ -469 +469 @@
     icon = 'actionicon_student.png'
     text = _('Show students')
-    target = 'showcoursestudents'
+    target = 'students'
 
 class ShowCertificateStudentsActionButton(ManageActionButton):
@@ -479 +479 @@
     icon = 'actionicon_student.png'
     text = _('Show students')
-    target = 'showcertstudents'
+    target = 'students'
 
 class ManageCertificateCourseActionButton(ManageActionButton):

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py

@@ -1306 +1306 @@
         # ... and view the list of students
         self.browser.getLink("Show students").click()
+        self.browser.getControl(name="session").value = ['2004']
+        self.browser.getControl(name="level").value = ['200']
+        self.browser.getControl("Show").click()
+        self.assertFalse(self.student_id in self.browser.contents)
+        self.browser.getControl(name="session").value = ['2004']
+        self.browser.getControl(name="level").value = ['100']
+        self.browser.getControl("Show").click()
         self.assertTrue(self.student_id in self.browser.contents)
         # The comment is indicated by 'yes'
@@ -1463 +1470 @@
         # and view the list of students
         self.browser.getLink("Show students").click()
-        self.assertTrue('<th>Fullname</th>' in self.browser.contents)
+        self.browser.getControl(name="session").value = ['2004']
+        self.browser.getControl(name="level").value = ['100']
+        self.browser.getControl("Show").click()
+        self.assertTrue('No student found.' in self.browser.contents)
         # No student in course so far
         self.assertFalse(self.student_id in self.browser.contents)
         studylevel = createObject(u'waeup.StudentStudyLevel')
         studylevel.level = 100
+        studylevel.level_session = 2004
         self.student['studycourse'].addStudentStudyLevel(
             self.certificate, studylevel)
         # Now the student has registered the course and can
         # be seen by the lecturer.
-        self.browser.open("http://localhost/app/faculties/fac1/dep1/courses/COURSE1/showcoursestudents")
+        self.browser.open("http://localhost/app/faculties/fac1/dep1/courses/COURSE1/students")
+        self.browser.getControl(name="session").value = ['2004']
+        self.browser.getControl(name="level").value = ['100']
+        self.browser.getControl("Show").click()
         self.assertTrue(self.student_id in self.browser.contents)
         # XXX: So far the lecturer can neither access ths student ...