Commit graph

105 commits

Author SHA1 Message Date
Nathaniel Guse
6c30441ad4 [feature/twig] Changing INCLUDEJS behavior slightly
Automatically parsing inline variables the same way it is done for
INCLUDE, INCLUDEPHP

PHPBB3-11598
2013-07-01 12:26:01 -05:00
Nathaniel Guse
8c75d1c1bc [feature/twig] Fix template_test.php
Various tests were broken completely, and some things such as whitespace
changed with Twig

PHPBB3-11598
2013-07-01 11:58:16 -05:00
Nathaniel Guse
8bda356dab [feature/twig] Correct includejs test
PHPBB3-11598
2013-06-24 22:40:17 -05:00
Nathaniel Guse
881bc60fbc [feature/twig] Delete invalid constructs template test
Invalid tags is no longer a valid test (invalid tags are ignored)

Twig contains tests for loading files, so we should not need to test this

PHPBB3-11598
2013-06-24 21:55:45 -05:00
Nathan Guse
9fab868f0f Merge remote-tracking branch 'remotes/cyberalien/ticket/11482' into develop
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/ticket/11482:
  [ticket/11482] Use double quotes for code
  [ticket/11482] Unit tests for advanced DEFINE
  [ticket/11482] Implementation of advanced DEFINE tag
2013-05-20 10:47:45 -05:00
Nathaniel Guse
356bc00a29 [ticket/11435] Mark extension spacing test as incomplete
This test fails until 11435 is fixed

Add newlines at EOF

PHPBB3-11435
2013-04-30 23:21:50 -05:00
Nathan Guse
ab87fe7982 [ticket/11435] Create test to make sure template/event output is equal
PHPBB3-11435
2013-04-25 15:26:59 -05:00
Vjacheslav Trushkin
5e8d92b0a8 [ticket/11482] Unit tests for advanced DEFINE
Unit tests for advanced DEFINE and ENDDEFINE

PHPBB3-11482
2013-04-10 09:00:34 +03:00
Oleg Pudeyev
62279d46a6 Merge PR #1194 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11323] Add tests for inclusion of defined variables
2013-01-13 20:13:17 -05:00
Marc Alexander
4c50a35b62 [ticket/11323] Add tests for inclusion of defined variables
This adds 2 tests for the template engine. The test using
include_define_variable.html will test if a defined variable, which was
defined with another template variable, can be used to include a file.
The second test will do the same inside a loop using a loop variable.

PHPBB3-11323
2013-01-14 01:14:29 +01:00
Oleg Pudeyev
48adf8c5de [feature/template-events] Create a dataset for template event tests.
Having all files in one directory is too much of a mess.

PHPBB3-9550
2012-11-17 16:40:00 -05:00
Oleg Pudeyev
667f8d581f [feature/template-events] Add a universal template event test.
Also drop the irrelevant includejs code and add a simple
template event test. The simple test is not working yet however
due to the template engine not correctly tracking which template
it is rendering.

PHPBB3-9550
2012-11-17 16:39:59 -05:00
Vjacheslav Trushkin
db688c2574 [feature/template-events] Template events unit test
Adding template events test

PHPBB3-9550
2012-11-17 16:39:58 -05:00
Fyorl
d0cb5bb093 [ticket/10970] Added support for forms such as {FOO}bar.{EXT}
PHPBB3-10970
2012-07-08 20:41:22 +01:00
Fyorl
d589623906 [ticket/10970] Paths of the form {FOO}/a/{BAR}/b parsed correctly
A new method to handle this type of path was added and
compile_tag_include, compile_tag_include_php and
compile_tag_include_js were modified to use it appropriately.

Tests were added for these three macros also.

PHPBB3-10970
2012-07-08 20:41:00 +01:00
Oleg Pudeyev
d8946e74de Merge PR #778 branch 'cyberalien/ticket/10800' into develop
* cyberalien/ticket/10800:
  [ticket/10800] Changing html to js for includejs tests
  [ticket/10800] Changing template paths in tests
2012-06-11 20:02:35 -04:00
Oleg Pudeyev
56b2b87423 [ticket/10882] Add a test for including a nonexistent file.
PHPBB3-10882
2012-05-10 03:36:58 -04:00
Oleg Pudeyev
720d07c9b3 [ticket/10882] Add test for an ENDIF without IF.
PHPBB3-10882
2012-05-10 03:28:54 -04:00
Oleg Pudeyev
9a38a034e5 [ticket/10882] Add test for an invalid template tag.
PHPBB3-10882
2012-05-10 03:28:35 -04:00
Vjacheslav Trushkin
5114edcafe [ticket/10800] Changing html to js for includejs tests
Changing .html to .js files for includejs tests

PHPBB3-10800
2012-05-01 17:41:46 +03:00
Vjacheslav Trushkin
4b2ede433e [ticket/10665] INCLUDEJS unit test
Adding INLCUDEJS test

PHPBB3-10665
2012-04-01 11:17:13 +03:00
Andreas Fischer
af66fbb93b Merge branch 'develop' of git://github.com/phpbb/phpbb3 into develop
* 'develop' of git://github.com/phpbb/phpbb3:
  [ticket/10392] Alter parent namespace stripping.
  [ticket/10392] Test for magic loop variables with nested namespaces.
  [ticket/10392] Missed fix for S_BLOCK_NAME.
  [ticket/10392] Fix access to nested special block variables.
2011-09-27 20:24:16 +02:00
Chris Smith
118bc6198e [ticket/10392] Test for magic loop variables with nested namespaces.
PHPBB3-10392
2011-09-27 01:02:58 +01:00
Chris Smith
fbb5c641b8 [ticket/10384] Update unit tests to test for failing variable.
PHPBB3-10384
2011-09-24 20:48:37 +01:00
Patrick Webster
b5a79009ce [ticket/10322] Separate template varref resolution from output generation
Most template variables can now have their PHP variable name resolved instead
of only compiling directly. This allows for the use of block vars in INCLUDE
statements. This does not work for language variables since they require
multiple checks. Added tests for the new types of allowed INCLUDEs.

PHPBB3-10322
2011-09-16 01:46:42 -05:00
Patrick Webster
b5ecb2f7a8 [ticket/10322] Dynamic template include test
PHPBB3-10322
2011-09-08 17:54:59 -05:00
Nils Adermann
ee203b4632 [feature/template-engine] Test template DEFINE statements across files
PHPBB3-9726
2011-07-17 14:28:56 -04:00
Oleg Pudeyev
f24d858cff [feature/template-engine] Added tests for template inheritance.
PHPBB3-9726
2011-05-18 10:51:33 -04:00
Oleg Pudeyev
94560d7086 [feature/template-engine] Make INCLUDEPHP relative to board root.
PHPBB3-9726
2011-05-12 20:13:32 -04:00
Oleg Pudeyev
0462ab3a4a [feature/template-engine] Add back IN_PHPBB preamble.
PHPBB3-9726
2011-05-12 20:13:30 -04:00
Igor Wiedler
427a5122d5 [feature/template-engine] Fix negative variable expressions
compile_tag_if had the flawed approach of adding an isset statement for
all variables to the beginning of the if. This fails for negative
expressions, and checking those takes a considerable effort.

The easier solution is to make the variable expression itself
conditional, defaulting to null if it is not set.

Thanks to naderman for the solution.

PHPBB3-9726
2011-04-25 23:19:36 -04:00
Oleg Pudeyev
f0b97cfdcf [feature/template-engine] Added a test for reuse of loop identifiers.
This currently does not pass, thus it is commented out.

The reuse appears implausible in the same file, however it may be
also done across template files where it is much harder to detect.

PHPBB3-9726
2011-04-25 23:19:32 -04:00
Oleg Pudeyev
f97411b911 [feature/template-engine] Corrected miscompilation of loop size constructs.
PHPBB3-9726
2011-04-25 23:19:25 -04:00
Oleg Pudeyev
5afc0b9b90 [feature/template-engine] Corrected an off-by-one error in nested namespaces.
This error resulted in a dot from the namespace being placed into
variable reference in compiled template code, thus creating bogus
compiled template code.

PHPBB3-9726
2011-04-24 23:13:13 -04:00
Oleg Pudeyev
e10d62badc [feature/template-engine] Added a test for multilevel references in loops.
This currently fails.

This test is a reduced version of permission_mask template in acp, which
is not correctly compiled by the current template engine code.

PHPBB3-9726
2011-04-24 21:56:26 -04:00
Oleg Pudeyev
f29f32e0d6 [feature/template-engine] Allow leading underscores in variable names.
Subsilver uses ._file in overall_header.

PHPBB3-9726
2011-04-24 01:08:48 -04:00
Oleg Pudeyev
4dfe4c7f13 [feature/template-engine] Adjust path in includephp template.
Now that tests are run from top level the '..' is wrong.

PHPBB3-9726
2011-04-24 01:08:30 -04:00
Marek A. Ruszczynski
4b646c6c80 [feature/template-engine] Update tests.
PHPBB3-9726
2011-04-23 22:48:50 -04:00
Marek A. Ruszczynski
7147382e9e [ticket/10081] Cleanup Template Tests.
There are no incomplete template tests anymore.

PHPBB3-10081
2011-03-07 18:26:46 +01:00
Igor Wiedler
9a52bd0301 [task/phpunit-xml] Use phpunit.xml for test suite
PHPBB3-9967
2011-01-04 22:54:01 +01:00
Nils Adermann
60bd1edcb5 [develop-olympus] Backported 3.1 unit tests to 3.0.
Start adding unit tests for bugs you fix! Tests for anything are
welcome really. We have to work on these a lot.
2010-03-10 16:24:19 +01:00
Nils Adermann
a0930e78c6 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10081] remove $phpEx.
  [ticket/10081] Cleanup Template Tests.
2011-03-07 19:10:19 +01:00
Igor Wiedler
14a84cf89c Merge branch 'develop-olympus' into develop
This commit also ports all ascraeus tests to the new format.

Conflicts:
	tests/all_tests.php
	tests/network/all_tests.php
	tests/request/all_tests.php
	tests/request/request_var.php
	tests/template/templates/includephp.html
2011-01-07 01:39:59 +01:00
Nils Adermann
2ed9d7878e Merge branch 'develop-olympus' into develop
Conflicts:
	tests/all_tests.php
	tests/request/all_tests.php
	tests/request/request_var.php
	tests/security/all_tests.php
	tests/security/extract_current_page.php
	tests/security/redirect.php
	tests/template/all_tests.php
	tests/template/template.php
	tests/template/templates/define.html
	tests/template/templates/expressions.html
	tests/template/templates/if.html
	tests/template/templates/includephp.html
	tests/template/templates/loop.html
	tests/template/templates/loop_advanced.html
	tests/template/templates/loop_vars.html
	tests/test_framework/framework.php
	tests/test_framework/phpbb_test_case.php
	tests/text_processing/all_tests.php
	tests/text_processing/make_clickable.php
	tests/utf/all_tests.php
	tests/utf/utf8_clean_string_test.php
	tests/utf/utf8_wordwrap_test.php
2010-03-10 16:43:42 +01:00
Chris Smith
2839f3a964 Fix most of the template test suite :)
git-svn-id: file:///svn/phpbb/trunk@9588 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-06-13 20:23:07 +00:00
Chris Smith
c95f0c7935 - Add template variable S_BLOCK_NAME
- Modify template::alter_block_array() so it supports modification of nested blocks
- Add (incomplete) tests for template::alter_block_array()


git-svn-id: file:///svn/phpbb/trunk@9116 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-11-25 00:31:32 +00:00
Chris Smith
332521a369 - Make a start on completing the phpDoc comments for the template engine
- Tidy template engine code, mainly PHP5 stuff, made some methods void instead of just returning true
- Add tests for the remaining untested compilation code


git-svn-id: file:///svn/phpbb/trunk@9115 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-11-24 21:59:33 +00:00
Chris Smith
f816e67c36 Test is (even|odd) by y
git-svn-id: file:///svn/phpbb/trunk@9110 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-11-24 11:46:28 +00:00
Chris Smith
6e2d2f85b5 More tests
git-svn-id: file:///svn/phpbb/trunk@9100 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-11-23 22:39:31 +00:00
Chris Smith
500eb05c48 test advanced loop constructs
git-svn-id: file:///svn/phpbb/trunk@9099 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-11-23 19:51:52 +00:00