Changeset 11001


Ignore:
Timestamp:
29 Jan 2014, 13:35:16 (11 years ago)
Author:
Henrik Bettermann
Message:

Fix tests.

Location:
main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/browser/browser.txt

    r11000 r11001  
    355355  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"...
    356356  ...<h1 class="kofa-content-label">Academic Section</h1>
    357   ...<td> <a href="TF"> <span>TF</span></a></td>
     357  ...<td> <a href="http://localhost/myuniversity/faculties/TF"> <span>TF</span></a></td>
    358358  ...<td>Faculty of My renamed faculty (TF)</td>
    359359  ...
    … …  
    481481  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"...
    482482  ...<h1 class="kofa-content-label">Departments</h1>
    483   ...<td> <a href="TD"> <span>TD</span></a></td>
     483  ...<td> <a href="http://localhost/myuniversity/faculties/TF/TD"> <span>TD</span></a></td>
    484484  ...<td>Department of TestDept (TD)</td>
    485485  ...
    … …  
    514514  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
    515515  ...<h1 class="kofa-content-label">Departments</h1>
    516   ...<td> <a href="TD"> <span>TD</span></a></td>
     516  ...<td> <a href="http://localhost/myuniversity/faculties/TF/TD"> <span>TD</span></a></td>
    517517  ...<td>Department of My renamed dept (TD)</td>
    518518  ...

  • main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/browser/pages.py

    r10995 r11001  
    316316                        now < temp_password_dict.get('timestamp', now) + delta:
    317317                        self.flash(
    318                             _('Your account has been temporarily deactivated.'))
     318                            _('Your account has been temporarily deactivated.'),
     319                            type='warning')
    319320                        return
    320321                    # Now we know that the student is suspended.
    321322                    comment = self._comment(student)
    322323                    if comment:
    323                         self.flash(comment)
     324                        self.flash(comment, type='warning')
    324325                    else:
    325                         self.flash(_('Your account has been deactivated.'))
     326                        self.flash(_('Your account has been deactivated.'),
     327                                   type='warning')
    326328                    return
    327329            self.flash(_('You entered invalid credentials.'))

  • main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/students/tests/test_browser.py

    r10704 r11001  
    21982198        self.browser.getControl("Login").click()
    21992199        self.assertMatches(
    2200             '...<div class="alert-message warning">'
     2200            '...<div class="alert alert-warning">'
    22012201            'Your account has been deactivated.</div>...', self.browser.contents)
    22022202        # If suspended_comment is set this message will be flashed instead
    … …  
    22062206        self.browser.getControl("Login").click()
    22072207        self.assertMatches(
    2208             '...<div class="alert-message warning">Aetsch baetsch!</div>...',
     2208            '...<div class="alert alert-warning">Aetsch baetsch!</div>...',
    22092209            self.browser.contents)
    22102210        self.student.suspended = False
Note: See TracChangeset for help on using the changeset viewer.