1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00

164 Commits

Author SHA1 Message Date
Nathaniel Guse
6f925552a5 [feature/twig] Fix includephp_from_subdir_test.php
PHPBB3-11598
2013-07-01 13:06:37 -05:00
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
1b2e5503ac [feature/twig] PHP test moved to a separate file
This had to be done because cached template files are available in memory,
so Twig doesn't ever reparse a template on the same page load

PHPBB3-11598
2013-07-01 12:07:29 -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
6c771a38de [feature/twig] Going back to Twig's handling of cache file names for now
My method was not working correctly, will work on it more later.

PHPBB3-11598
2013-06-25 19:24:32 -05:00
Nathaniel Guse
25f0ee9fb6 [feature/twig] Fixing template events test (and behavior)
According to the test, template event behavior was never correct.

Only ONE template event file is supposed to be included from EACH
extension. As it was before, EVERY matching template event file from
each extension was included (this was how it was designed).

E.g.
Event call in prosilver "foo"
Extension has template "foo" in prosilver AND all

foo from all would be included, then foo from prosilver would be included

This was clearly not designed correctly as only the most specific event
file from each extension should be loaded, otherwise events could only
ever be put in a single style tree (either only all, or only prosilver
and subsilver2 and any style that inherits from neither of those).
Otherwise the events would be duplicated on output (which is clearly not
desirable).

The Twig behavior already was correct as I designed it, so only the one
most specific template event file found would be included from each
extension. The tests had to be updated for the correct expected output.

PHPBB3-11598
2013-06-25 19:22:23 -05:00
Nathaniel Guse
1c8c03c4db [feature/twig] INCLUDEPHP token abs paths & fix test
PHPBB3-11598
2013-06-25 16:51:50 -05:00
Nathaniel Guse
fe61527c52 [feature/twig] Remove duplicate test calls
PHPBB3-11598
2013-06-24 23:29:22 -05:00
Nathaniel Guse
dabc0edea2 [feature/twig] Delete template_spacing_test.php
No longer needed

PHPBB3-11598
2013-06-24 22:50:09 -05:00
Nathaniel Guse
1d6a51f51a [feature/twig] Delete template_locate_test.php
No longer needed

PHPBB3-11598
2013-06-24 22:44:57 -05:00
Nathaniel Guse
92391d2f4f [feature/twig] Correct template_inheritance_test.php
PHPBB3-11598
2013-06-24 22:44:12 -05:00
Nathaniel Guse
8bda356dab [feature/twig] Correct includejs test
PHPBB3-11598
2013-06-24 22:40:17 -05:00
Nathaniel Guse
814d57d201 [feature/twig] Delete template_compile_test.php
No longer necessary

PHPBB3-11598
2013-06-24 21:58:09 -05:00
Nathaniel Guse
d986e124fe [feature/twig] Delete renderer_eval_test.php
No longer necessary

PHPBB3-11598
2013-06-24 21:57:01 -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
a1f957af84 [feature/twig] Working on fixing tests
PHPBB3-11598
2013-06-24 15:28:54 -05:00
Nathan Guse
38d8025f12 [feature/twig] Use phpbb_template_twig in tests
Replace all new phpbb_template( with new phpbb_template_twig(

PHPBB3-11598
2013-06-12 13:29:57 -05:00
Nathan Guse
06720fb0d7 [ticket/11435] Enable spacing test as it should now pass
PHPBB3-11435
2013-05-20 11:46:08 -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
9608d9bf1e [ticket/11519] Rename test event template file
As requested by Oleg
https://github.com/phpbb/phpbb3/pull/1340#issuecomment-17306967

PHPBB3-11519
2013-05-04 11:45:49 -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
Nathan Guse
6801e36def [ticket/11435] Fix comments in events test
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
Marc Alexander
dd5963eabb [ticket/11323] Enable tests for inclusion of defined variables
PHPBB3-11323
2013-02-19 16:08:36 +01: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
d42d71b47d [feature/template-events] Test for event that is defined in parent style only.
PHPBB3-9550
2012-11-17 16:42:44 -05:00
Oleg Pudeyev
5f88bbbef3 [feature/template-events] Specify style names, add inheritance tests.
PHPBB3-9550
2012-11-17 16:42:44 -05:00
Oleg Pudeyev
21a244543d [feature/template-events] Normalize expected directory trees.
PHPBB3-9550
2012-11-17 16:42:43 -05:00
Oleg Pudeyev
0e6d12dfc4 [feature/template-events] Allow dataset to be correctly selectable.
PHPBB3-9550
2012-11-17 16:42:43 -05:00
Oleg Pudeyev
99d93a3f0f [feature/template-events] Dataset for template event testing with inheritance.
PHPBB3-9550
2012-11-17 16:42:43 -05:00
Oleg Pudeyev
44d6dc4c4c [feature/template-events] Convert a single style name to array of them.
This allows template code to know the entire style hierarchy for
templates being rendered.

PHPBB3-9550
2012-11-17 16:42:40 -05:00
Oleg Pudeyev
0a29312d83 [feature/template-events] Chase dependency injection for template context.
PHPBB3-9550
2012-11-17 16:40:01 -05:00
Oleg Pudeyev
9a7c8721ce [feature/template-events] Adjust template events test to use the dataset.
PHPBB3-9550
2012-11-17 16:40:00 -05: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
0df0c6199b [feature/template-events] Switch template event test to data providers.
PHPBB3-9550
2012-11-17 16:39:59 -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
Oleg Pudeyev
f46f48a2cf [feature/template-events] Chase template/style renames and changes.
PHPBB3-9550
2012-11-17 16:39:58 -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
Igor Wiedler
b5e069f879 Merge remote-tracking branch 'p/ticket/10933' into develop
* p/ticket/10933:
  [ticket/10933] Prose for get_first_file_location.
  [ticket/10933] Remaining documentation for added functions in resource locator
  [ticket/10933] Update template locator test to use style resource locator.
  [ticket/10933] Dispose of locate function in template class.
  [ticket/10933] Add mutators for template_path to style resource locator.
  [ticket/10933] Delete template_path assignment.
  [ticket/10933] Delete template_path from template class.
  [ticket/10933] Add get_first_template_location.
2012-11-17 19:49:03 +01:00
Nils Adermann
f0cfae1f01 Merge pull request #881 from Fyorl/ticket/10970
Allow INCLUDE template macros to accept paths of the form {FOO}/a/{BAR}/c
2012-11-10 07:46:50 -08:00
Oleg Pudeyev
a7babc211c [ticket/11159] static public is the currently approved order.
PHPBB3-11159
2012-11-06 10:41:06 -05:00
Oleg Pudeyev
b878d5daa9 [ticket/10933] Update template locator test to use style resource locator.
There is no reason for it to go through a template instance to test
resource locator functionality.

PHPBB3-10933
2012-11-02 19:39:07 -04:00
Oleg Pudeyev
767d09227b [ticket/10933] Dependency inject template context.
PHPBB3-10933
2012-11-02 18:51:35 -04:00
Oleg Pudeyev
c3fb0f359c [ticket/10933] Specify empty template path for absolute includephp test.
This was probably necessary all along, and the test happened to work
because state was not correctly reset between test runs and
a previous test set an empty template path.

PHPBB3-10933
2012-11-02 18:06:21 -04:00
Andreas Fischer
d3bbde69c4 [ticket/10973] Drop all require_once for mocks. Use autoloading.
PHPBB3-10973
2012-07-08 22:57:23 +02: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