makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-17 16:58:51 +00:00
Code Issues Projects Releases Packages Wiki Activity
18932 commits 18 branches 192 tags 207 MiB
Commit graph

1826 commits

Author SHA1 Message Date
Nathaniel Guse
8cf6dbd950 [feature/twig] Trying some new debug code for this mkdir error 
PHPBB3-11598
 2013-07-04 13:40:37 -05:00
Nathaniel Guse
4f6cb9acbd [feature/twig] Fix helper URL test 
PHPBB3-11598
 2013-07-04 13:19:21 -05:00
Nathaniel Guse
35b628f737 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/twig 
# By Joseph Warner (44) and others
# Via Joas Schilling (4) and others
* 'develop' of https://github.com/phpbb/phpbb3: (63 commits)
  [ticket/11617] Remove spaces and tabs from empty lines
  [ticket/11617] Missing U_ACTION in acp_captcha.php
  [feature/auth-refactor] Fix code style issue
  [feature/auth-refactor] Fix comment grammar
  [feature/auth-refactor] Fix the actual cause of test failures
  [feature/auth-refactor] A possible fix for the functional test failures
  [ticket/11566] Subsilver template error displayed after table headers
  [ticket/11566] Remove extra pair of brackets from conditional statement
  [ticket/11566] Check that guest doesn't have reporting permission by default
  [ticket/11566] Add captcha to report post template in subsilver
  [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init
  [ticket/11566] Rename var to $visual_confirmation_response
  [ticket/11566] Revert forum permission changes
  [ticket/11566] Use language variable instead of hardcode
  [ticket/11566] add tests for reporting post
  [ticket/11566] add captcha reset and hidden fields
  [ticket/11566] display error instead of trigger_error
  [ticket/11566] add error in template
  [ticket/11566] add error functionality
  [ticket/11566] add interface for captcha
  ...
 2013-07-04 11:19:10 -05:00
Nathaniel Guse
bb56c1a391 Revert "[feature/twig] Call set_style in the foo/bar controller for functional tests" 
This reverts commit 5c39f26cd2.
 2013-07-04 11:09:33 -05:00
Nathaniel Guse
81f27fd87e [feature/twig] Add test to make sure nested loops get the correct S_ROW_COUNT 
PHPBB3-11598
 2013-07-04 10:40:14 -05:00
Nathaniel Guse
5c39f26cd2 [feature/twig] Call set_style in the foo/bar controller for functional tests 
PHPBB3-11598
 2013-07-04 10:14:43 -05:00
Marc Alexander
68f001aaaf Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11600 2013-07-04 00:14:48 +02:00
David King
73c289ae49 Merge remote-tracking branch 'Hardolaf/feature/auth-refactor' into develop 
* Hardolaf/feature/auth-refactor: (44 commits)
  [feature/auth-refactor] Fix code style issue
  [feature/auth-refactor] Fix comment grammar
  [feature/auth-refactor] Fix the actual cause of test failures
  [feature/auth-refactor] A possible fix for the functional test failures
  [feature/auth-refactor] Forgot @inheritdoc on methods
  [feature/auth-refactor] Finish and clean up documentation
  [feature/auth-refactor] Change phpEx to php_ext in new classes
  [feature/auth-refactor] Fix two session tests broken by changes
  [feature/auth-refactor] Removed no longer used variable
  [feature/auth-refactor] Fix errors in acp_board
  [feature/auth-refactor] Fix indentation on acp_board
  [feature/auth-refactor] Refactor auth in acp_board
  [feature/auth-refactor] Don't truncate name then reattach same thing
  [feature/auth-refactor] Remove old auth plugins
  [feature/auth-refactor] Remove references to old auth plugins
  [feature/auth-refactor] Fix auth tests to use mock objects correctly
  [feature/auth-refactor] Test validate_session on provider_apache
  [feature/auth-refactor] Test autologin() on provider_apache
  [feature/auth-refactor] Test login() for provider_apache
  [feature/auth-refactor] Test for init on provider_apache
  ...
 2013-07-03 12:46:18 -04:00
Nathaniel Guse
f1717412f3 [feature/twig] Debugging test failures 
PHPBB3-11598
 2013-07-03 09:31:35 -05:00
Andreas Fischer
950a3a7d95 [ticket/11619] Some tests for get_remote_file(). 
PHPBB3-11619
 2013-07-03 15:31:24 +02:00
Nathaniel Guse
52bce2ce11 [feature/twig] Prevent errors from mkdir if the dir already exists 
PHPBB3-11598
 2013-07-02 13:43:02 -05:00
Nathaniel Guse
2507c648fe [feature/twig] template->cachepath is now private, missed checking tests 
PHPBB3-11598
 2013-07-02 12:59:23 -05:00
Nathaniel Guse
6bbe92a8d0 [feature/twig] Move test_php back to template_test 
Was originally moved because I thought that a new test file might mean a new
instance and the memory would be cleared, fixing the original problem, but
that isn't true and it was fixed another way.

PHPBB3-11598
 2013-07-02 12:50:55 -05:00
Nathaniel Guse
b4947f94ed [feature/twig] Should compare to $this->test_path rather than hardcoded path 
PHPBB3-11598
 2013-07-02 12:43:26 -05:00
Nathaniel Guse
c6c064a136 [feature/twig] Fix includejs test 
PHPBB3-11598
 2013-07-02 11:21:31 -05:00
Nathaniel Guse
9dce2b28af [feature/twig] Fix template test case 
PHPBB3-11598
 2013-07-02 11:21:05 -05:00
Joas Schilling
ec4a43c91c Merge remote-tracking branch 'remotes/dhruvgoel92/ticket/11566-develop' into develop 
* remotes/dhruvgoel92/ticket/11566-develop:
  [ticket/11566] Subsilver template error displayed after table headers
  [ticket/11566] Remove extra pair of brackets from conditional statement
  [ticket/11566] Check that guest doesn't have reporting permission by default
  [ticket/11566] Add captcha to report post template in subsilver
  [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init
  [ticket/11566] Rename var to $visual_confirmation_response
  [ticket/11566] Revert forum permission changes
  [ticket/11566] Use language variable instead of hardcode
  [ticket/11566] add tests for reporting post
  [ticket/11566] add captcha reset and hidden fields
  [ticket/11566] display error instead of trigger_error
  [ticket/11566] add error in template
  [ticket/11566] add error functionality
  [ticket/11566] add interface for captcha
 2013-07-02 13:07:53 +02:00
Joas Schilling
d4531c9cea Merge remote-tracking branch 'remotes/dhruvgoel92/ticket/11566' into develop-olympus 
* remotes/dhruvgoel92/ticket/11566:
  [ticket/11566] Subsilver template error displayed after table headers
  [ticket/11566] Remove extra pair of brackets from conditional statement
  [ticket/11566] Check that guest doesn't have reporting permission by default
  [ticket/11566] Add captcha to report post template in subsilver
  [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init
  [ticket/11566] Rename var to $visual_confirmation_response
  [ticket/11566] Revert forum permission changes
  [ticket/11566] Use language variable instead of hardcode
  [ticket/11566] add tests for reporting post
  [ticket/11566] add captcha reset and hidden fields
  [ticket/11566] display error instead of trigger_error
  [ticket/11566] add error in template
  [ticket/11566] add error functionality
  [ticket/11566] add interface for captcha
 2013-07-02 13:07:14 +02:00
Nathaniel Guse
87e4e05220 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/twig 
# By Dhruv
# Via Andreas Fischer (3) and Dhruv (1)
* 'develop' of https://github.com/phpbb/phpbb3:
  [ticket/10838] Fix URL for wiki and remove irrelevant line
  [ticket/10838] Remove php 5.4 and builtin server references
  [ticket/10838] Fix missing data
  [ticket/10838] separate database used mentioned in unit tests
  [ticket/11585] Make $auth_admin class property
  [ticket/10838] Updated RUNNING_TESTS.md
 2013-07-01 20:38:29 -05:00
Andreas Fischer
fb777b3e20 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10838] Fix URL for wiki and remove irrelevant line
  [ticket/10838] Remove php 5.4 and builtin server references
  [ticket/10838] Fix missing data
  [ticket/10838] separate database used mentioned in unit tests
  [ticket/10838] Updated RUNNING_TESTS.md
 2013-07-01 21:23:07 +02:00
Andreas Fischer
1a292750f2 Merge remote-tracking branch 'dhruvgoel92/ticket/10838' into develop-olympus 
* dhruvgoel92/ticket/10838:
  [ticket/10838] Fix URL for wiki and remove irrelevant line
  [ticket/10838] Remove php 5.4 and builtin server references
  [ticket/10838] Fix missing data
  [ticket/10838] separate database used mentioned in unit tests
  [ticket/10838] Updated RUNNING_TESTS.md
 2013-07-01 21:22:51 +02:00
Dhruv
440986dc3f [ticket/10838] Fix URL for wiki and remove irrelevant line 
PHPBB3-10838
 2013-07-02 00:50:16 +05:30
Dhruv
89393e11e8 [ticket/10838] Remove php 5.4 and builtin server references 
PHPBB3-10838
 2013-07-02 00:50:15 +05:30
Dhruv
9c9f09d640 [ticket/10838] Fix missing data 
PHPBB3-10838
 2013-07-02 00:50:14 +05:30
Dhruv
5ed4dbb5b7 [ticket/10838] separate database used mentioned in unit tests 
Separate database used for tests which is deleted each time
tests are run information is added to unit tests.

PHPBB3-10838
 2013-07-02 00:47:32 +05:30
Nathaniel Guse
bdc05b7dc8 [feature/twig] Remove resource locator dependency from template 
PHPBB3-11598
 2013-07-01 13:28:08 -05:00
Nathaniel Guse
3060cbe089 [feature/twig] Fix template/template_php_test.php 
Must create a template file in the cache to load as this causes errors
otherwise. The problem was that Twig builds template files into classes,
which are always stored in PHP memory after being loaded. Because of this,
Twig would never recompile a template that was already compiled on the same
page load (so switching enable PHP on/off in two tests would not work).

PHPBB3-11598
 2013-07-01 13:17:59 -05:00
Nathaniel Guse
6f925552a5 [feature/twig] Fix includephp_from_subdir_test.php 
PHPBB3-11598
 2013-07-01 13:06:37 -05:00
Dhruv
c80b80ca0f Merge branch 'ticket/11566' into ticket/11566-develop 
* ticket/11566:
  [ticket/11566] Subsilver template error displayed after table headers
  [ticket/11566] Remove extra pair of brackets from conditional statement
  [ticket/11566] Check that guest doesn't have reporting permission by default
  [ticket/11566] Add captcha to report post template in subsilver
  [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init
  [ticket/11566] Rename var to $visual_confirmation_response
  [ticket/11566] Revert forum permission changes
  [ticket/11566] Use language variable instead of hardcode
  [ticket/11566] add tests for reporting post
  [ticket/11566] add captcha reset and hidden fields
  [ticket/11566] display error instead of trigger_error
  [ticket/11566] add error in template
  [ticket/11566] add error functionality
  [ticket/11566] add interface for captcha

Conflicts:
	phpBB/report.php
 2013-07-01 23:25:29 +05:30
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
f08330f762 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/twig 
# By Dhruv (7) and others
# Via Andreas Fischer (7) and others
* 'develop' of https://github.com/phpbb/phpbb3:
  [ticket/11593] initialize $is_expr as null before being passed to get_varref
  [ticket/9341] Assert that page doesnt contain next or prev page posts
  [ticket/9341] Follow the Next/Prev link in tests follow the next/prev link and then assert if the page contains its last post or not
  [ticket/9341] remove PREV_PAGE tpl var used for backward compatability
  [ticket/11618] Replace glob() with scandir() and string matching
  [ticket/9341] Add tests for checking Next and Previous template vars
  [ticket/9341] Move create_topic and post into functional test case
  [ticket/11615] Fix typo in creation_test
  [ticket/11615] Remove magic number in creation_test
  [ticket/11615] Rename class in file to match
  [ticket/11615] Rename init_test to creation_test for clarity
  [ticket/9341] Use U_PREVIOUS and U_NEXT in template files
  [ticket/9341] Correctly named template vars

Conflicts:
	tests/template/template_test_case.php
 2013-07-01 12:03:24 -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
Dhruv
84ec1f5423 [ticket/11566] Check that guest doesn't have reporting permission by default 
PHPBB3-11566
 2013-07-01 21:49:06 +05:30
Dhruv
434d14e1d5 [ticket/11566] Revert forum permission changes 
Revert the f_report permission for guests in the functional tests

PHPBB3-11566
 2013-07-01 21:49:01 +05:30
Dhruv
1abc3d91d0 [ticket/11566] Use language variable instead of hardcode 
Add language variable in tests

PHPBB3-11566
 2013-07-01 21:49:00 +05:30
Dhruv
43053c541a [ticket/11566] add tests for reporting post 
Functional test for reporting post and check if captcha validation
is required for guests and not for registerted users

PHPBB3-11566
 2013-07-01 21:48:59 +05:30
Joas Schilling
8233c3e340 Merge remote-tracking branch 'dhruvgoel92/ticket/9341' into develop 
* dhruvgoel92/ticket/9341:
  [ticket/9341] Assert that page doesnt contain next or prev page posts
  [ticket/9341] Follow the Next/Prev link in tests follow the next/prev link and then assert if the page contains its last post or not
  [ticket/9341] remove PREV_PAGE tpl var used for backward compatability
  [ticket/9341] Add tests for checking Next and Previous template vars
  [ticket/9341] Move create_topic and post into functional test case
  [ticket/9341] Use U_PREVIOUS and U_NEXT in template files
  [ticket/9341] Correctly named template vars
 2013-06-29 15:49:23 +02:00
Dhruv
91e773a795 [ticket/9341] Assert that page doesnt contain next or prev page posts 
PHPBB3-9341
 2013-06-28 01:02:00 +05:30
Dhruv
22998ee5ee [ticket/9341] Follow the Next/Prev link in tests 
follow the next/prev link and then assert if the page contains
its last post or not

PHPBB3-9341
 2013-06-28 00:52:36 +05:30
Andreas Fischer
f2b174c8b5 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11618] Replace glob() with scandir() and string matching

Conflicts:
	tests/template/template_test.php
 2013-06-27 02:23:57 +02:00
Andreas Fischer
960b20e45b Merge remote-tracking branch 'Hardolaf/ticket/11618' into develop-olympus 
* Hardolaf/ticket/11618:
  [ticket/11618] Replace glob() with scandir() and string matching
 2013-06-27 02:08:48 +02:00
Joseph Warner
8e575487ff [ticket/11618] Replace glob() with scandir() and string matching 
Removes glob from template tests as glob() does not work on all
systems according to PHP documentation as has been noticed by users.

PHPBB3-11618
 2013-06-26 19:51:52 -04:00
Andreas Fischer
e0c572d1d8 Merge remote-tracking branch 'asperous/ticket/11615/creation_test' into develop-olympus 
* asperous/ticket/11615/creation_test:
  [ticket/11615] Fix typo in creation_test
  [ticket/11615] Remove magic number in creation_test
  [ticket/11615] Rename class in file to match
  [ticket/11615] Rename init_test to creation_test for clarity
 2013-06-27 01:21:28 +02:00
Andreas Fischer
d0f0704515 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11615] Fix typo in creation_test
  [ticket/11615] Remove magic number in creation_test
  [ticket/11615] Rename class in file to match
  [ticket/11615] Rename init_test to creation_test for clarity
 2013-06-27 01:12:34 +02:00
Andreas Fischer
95730c1ff1 Merge remote-tracking branch 'asperous/ticket/11615/creation_test' into develop-olympus 
* asperous/ticket/11615/creation_test:
  [ticket/11615] Fix typo in creation_test
  [ticket/11615] Remove magic number in creation_test
  [ticket/11615] Rename class in file to match
  [ticket/11615] Rename init_test to creation_test for clarity
 2013-06-27 01:09:52 +02:00
Dhruv
fe4bfd02a3 [ticket/10838] Updated RUNNING_TESTS.md 
PHPBB3-10838
 2013-06-27 01:52:22 +05:30
Dhruv
bd9ece7ab6 [ticket/9341] Add tests for checking Next and Previous template vars 
PHPBB3-9341
 2013-06-27 00:59:37 +05:30
Dhruv
1f989c6be7 [ticket/9341] Move create_topic and post into functional test case 
create_topic and create_post are moved into functional test case
so that they can be used by other tests as well

PHPBB3-9341
 2013-06-27 00:57:34 +05:30
Andy Chase
7ba81a293f [ticket/11615] Fix typo in creation_test 
PHPBB3-11615
 2013-06-26 11:49:37 -07:00