diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2012-10-06 10:49:22 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2012-10-06 10:49:22 +0200 |
| commit | 4bc5fe9843afbd99c79d27faa4d5c1de1aa2eb1b (patch) | |
| tree | 6db315c71eade74c0c903df9714b201bb72638c5 /_test | |
| parent | 93a7873eb0646b5712d75b031cd8b8b143968ba2 (diff) | |
| parent | 1fe8f13dbbf0b227079aadee9d206936fbb96852 (diff) | |
| download | rpg-4bc5fe9843afbd99c79d27faa4d5c1de1aa2eb1b.tar.gz rpg-4bc5fe9843afbd99c79d27faa4d5c1de1aa2eb1b.tar.bz2 | |
Merge branch 'master' into future
* master:
Always load the parser in the test environment
Escape filename in regex in search_index()
Changed XHTML validator icon to HTML5 (FS#2619)
fixed wrong apple-touch-icon extension (FS#2627)
Revert "removed html dependency from media query detection JS in new template"
removed html dependency from media query detection JS in new template
de-couple mobile JS from widths to actual media query equivalent (fixes FS#2623)
Diffstat (limited to '_test')
| -rw-r--r-- | _test/bootstrap.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/_test/bootstrap.php b/_test/bootstrap.php index 58ad6a0d7..310b3627a 100644 --- a/_test/bootstrap.php +++ b/_test/bootstrap.php @@ -110,3 +110,7 @@ $dh->close(); // load dw require_once(DOKU_INC.'inc/init.php'); +// load the parser so $PARSER_MODES is defined before the tests start +// otherwise PHPUnit unsets $PARSER_MODES in some cases which breaks p_get_parsermodes() +require_once(DOKU_INC.'inc/parser/parser.php'); + |