Changeset 7108 for main/waeup.sirp/trunk/src/waeup/sirp/students/tests

Timestamp:

14 Nov 2011, 10:01:17 (13 years ago)

Author:

Henrik Bettermann

Message:

Reorganize file upload. Each viewlet gets an upload and a delete button and writes its own log message. Thus there is one line per file deletion or file upload in the log file. The save action does no longer upload the files.

It works perfectly in the UI but I have still some problems with the browser test.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/students/tests/test_browser.py (modified) (2 diffs)

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

@@ -365 +365 @@
         # as birth certificate
         pseudo_image = StringIO('I pretend to be a graphics file')
-        ctrl = self.browser.getControl(name='form.birth_certificate')
+        ctrl = self.browser.getControl(name='birth_certificate')
         file_ctrl = ctrl.mech_control
         file_ctrl.add_file(pseudo_image, filename='myphoto.jpg')
-        self.browser.getControl("Save").click() # submit form
-        # Form has errors ...
-        self.assertTrue(
-            'Required input is missing' in self.browser.contents)
-        # ... but file has been uploaded and a correct <img> link included
-        self.assertTrue(
+        # The Save action does not upload files
+        self.browser.getControl("Save (no upload)").click() # submit form
+        self.assertFalse(
             '<a target="image" href="birth_certificate.jpg">' in self.browser.contents)
+        # ... but the Upload submit button
+        import pdb; pdb.set_trace()
+        ctrl = self.browser.getControl(name='birth_certificate')
+        file_ctrl = ctrl.mech_control
+        file_ctrl.add_file(pseudo_image, filename='myphoto.jpg')
+        self.browser.getControl("Upload").click() # submit form
         # There is a correct <img> link included
         self.assertTrue(
@@ -388 +391 @@
         photo_content = 'A' * 1024 * 151  # A string of 21 KB size
         pseudo_image = StringIO(photo_content)
-        ctrl = self.browser.getControl(name='form.birth_certificate')
+        ctrl = self.browser.getControl(name='birth_certificate')
         file_ctrl = ctrl.mech_control
         file_ctrl.add_file(pseudo_image, filename='myphoto.jpg')