1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-29 04:50:51 +02:00
Commit Graph

1631 Commits

Author SHA1 Message Date
Joas Schilling
e399dc162b Merge remote-tracking branch 'EXreaction/ticket/11701' into develop
* EXreaction/ticket/11701:
  [ticket/11701] New line at EOF
  [ticket/11701] Test events in loops
  [ticket/11701] Refix regex for appending |length
  [ticket/11701] Fix regex for appending |length
  [ticket/11701] Fix loops var check
  [ticket/11701] Remove useless str_replace
  [ticket/11701] Loop variables are not passed correctly to events
2013-08-09 17:25:00 +02:00
Dhruv
f35d732f40 Merge remote-tracking branch 'nickvergessen/ticket/11574' into develop
# By Joas Schilling (16) and Igor Wiedler (6)
# Via Joas Schilling (5) and Igor Wiedler (2)
* nickvergessen/ticket/11574: (22 commits)
  [ticket/11574] Remove install/udpate/new/ fallback from database_update.php
  [ticket/11574] Do not display incompatible package note after successful update
  [ticket/11574] Remove old "continue step"-message
  [ticket/11574] Change order of files and database update
  [ticket/11574] Fix more issues in the updater
  [ticket/11574] Add trailing slash for consistency
  [ticket/11574] Fix table prefix in database updater
  [ticket/11574] Fix various path issues in the updater
  [ticket/11574] Make install language filename less crazy
  [ticket/11574] Use alternate DI config file for updater
  [ticket/11574] Include normalizer so it loads form the correct directory
  [ticket/11574] Only fall back to install/update versions, when IN_INSTALL ;)
  [ticket/11574] Use log object instead of old function
  [ticket/11574] Include vendor into update packages
  [ticket/11574] Create phpbb_log object before using it.
  [ticket/11574] Add correct language parameter to return links
  [ticket/11574] Use request object rather then request_var function
  [ticket/11574] Load new language files whenever possible
  [ticket/11574] Require new files in install/index.php and add a class loader
  [ticket/11574] Require new files in database_update.php and add a class loader
  ...
2013-08-08 13:56:39 +05:30
Andreas Fischer
08a6bd2218 Merge remote-tracking branch 'asperous/ticket/11761' into develop
* asperous/ticket/11761:
  [ticket/11761] Serve blank file locally in functional test
2013-08-06 22:53:15 +02:00
Andy Chase
2508439b02 [ticket/11761] Serve blank file locally in functional test
Example.org no longer serves blank responses, failing functional tests.

this patch creates a  blank file and serve it locally during the test,
instead of hitting the http://example.org servers kindly provided by IANA.

PHPBB3-11761
2013-08-06 12:39:28 -07:00
Joas Schilling
78623bf2ff Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11762] Added call to test class's parent::setUp().
  [ticket/11762] Fixed test's filename
  [ticket/11762] Use the === operator to distinguish "0" from ""
2013-08-03 15:37:01 +02:00
s9e
9db1728b4b [ticket/11762] Added call to test class's parent::setUp().
Added call to test class's parent::setUp(). Updated copyright year.

PHPBB3-11762
2013-08-03 14:06:43 +02:00
s9e
68aa974a20 [ticket/11762] Fixed test's filename
PHPBB3-11762
2013-08-03 12:29:23 +02:00
s9e
8a02db317e [ticket/11762] Use the === operator to distinguish "0" from ""
PHPBB3-11762
2013-08-03 12:20:52 +02:00
Joas Schilling
91392c7288 Merge remote-tracking branch 'phpbb/develop' into ticket/11574
* phpbb/develop: (130 commits)
  [ticket/11638] Changed the layout to match the other similar commits
  [ticket/11640] removed the space that I wonder what it was doing there.
  [ticket/11749] Move event after all template data has been defined
  [ticket/10917] Variable used only once so delete it
  [ticket/10917] Revert use of phpbb wrapper
  [ticket/11749] Template events for topic_list_row_pre/append
  [ticket/11749] PHP Events for viewforum.php
  [ticket/11749] PHP Events for search.php
  [ticket/11740] Update FAQ to include Ideas Centre
  [ticket/11062] If user's language is english there is no further work needed
  [ticket/11062] Load new strings from user's language file if provided
  [ticket/10917] Using phpbb wrapper
  [ticket/10917] Fixed notice that files are out of date when updating to an unreleased version
  [ticket/11741] Fix empty brackets and remove bullet
  [ticket/11638] Removed the unneeded reset.
  [ticket/11638] Use the $parse_flags like the other commits
  [ticket/11638] Reverted to use the $parse tags way as the other ones
  [ticket/11638] Updated: bitwise $parse_flags use optionset()
  [ticket/11656] Made the check for the bitfield just like other PR's
  [ticket/11667] Use @inheritdoc
  ...
2013-07-30 01:06:11 +02:00
Nathaniel Guse
0f83d7fd6c [ticket/11701] New line at EOF
PHPBB3-11701
2013-07-23 09:28:24 -05:00
Nathaniel Guse
30bfd7fb61 [ticket/11701] Test events in loops
PHPBB3-11701
2013-07-23 09:28:24 -05:00
Nathaniel Guse
c0b9db1c62 [ticket/11701] Fix loops var check
PHPBB3-11701
2013-07-23 09:26:50 -05:00
Andreas Fischer
7d8e80241c Merge remote-tracking branch 'EXreaction/ticket/11718' into develop
* EXreaction/ticket/11718:
  [ticket/11718] Quick test for fixes in ELSEIF
  [ticket/11718] Twig lexer only correcting statements in IF, not ELSEIF

Conflicts:
	tests/template/template_test.php
2013-07-23 04:24:05 +02:00
Andreas Fischer
1004aaf787 Merge remote-tracking branch 'asperous/ticket/11620' into develop
* asperous/ticket/11620: (46 commits)
  [ticket/11620] Whitespace and combine function into test_case
  [ticket/11620] Move check_ban_test functions to setUp/tearDown for clarity
  [ticket/11620] Changed incorrect global variable
  [ticket/11620] Minor indentation changes and comment clarity
  [ticket/11620] Expected and actual test conditions wrongly swapped
  [ticket/11620] Space between . in directory import concatenation
  [ticket/11620] Changes to match merge
  [ticket/11620] Changes for code guidelines consistency
  [ticket/11620] Fix a static calls to non-static for session captcha
  [ticket/11620] Cleanup creation_test that was renamed on a cherry-pick
  [ticket/11620] Update auth_provider for new interface
  [ticket/11620] Added garbage_collection_test
  [ticket/11620] Fixed check_ban_test errors with cache and ban warning message
  [ticket/11620] Fixed a typo on check_ban_test
  [ticket/11620]  Refactored check_isvalid_test to use session_test_case
  [ticket/11615] Refactored isvalid test to be more imperative
  [ticket/11615]  Rename continue -> check_isvalid for clarity
  [ticket/11620] Added a test for checking if users are banned
  [ticket/11620] Remove typo in beginning of session_key_test
  [ticket/11620] Typo in file name session_key_tests -> test
  ...
2013-07-23 03:12:33 +02:00
Andy Chase
2fe2724e68 [ticket/11620] Whitespace and combine function into test_case
PHPBB3-11620
2013-07-22 17:39:45 -07:00
Andy Chase
0c54fb034b [ticket/11620] Move check_ban_test functions to setUp/tearDown for clarity
PHPBB3-11620
2013-07-22 17:39:14 -07:00
Andy Chase
568de3b8ce [ticket/11620] Changed incorrect global variable
PHPBB3-11620
2013-07-22 16:27:22 -07:00
Andy Chase
cc6147f876 [ticket/11620] Minor indentation changes and comment clarity
PHPBB3-11620
2013-07-22 16:27:18 -07:00
Joas Schilling
8dc8ee205a [ticket/11733] Add browse test for feed.php
PHPBB3-11733
2013-07-23 00:58:03 +02:00
Andy Chase
9d38ded228 [ticket/11620] Expected and actual test conditions wrongly swapped
PHPBB3-11620
2013-07-22 13:52:17 -07:00
Andy Chase
9dbd42e945 [ticket/11620] Space between . in directory import concatenation
PHPBB3-11620
2013-07-22 13:51:06 -07:00
Andy Chase
28e98466d9 [ticket/11620] Changes to match merge
PHPBB3-11620
2013-07-22 12:26:02 -07:00
Andy Chase
e2a769ac79 Merge branch 'develop' into ticket/11620 2013-07-22 11:29:36 -07:00
Nathan Guse
b71038486e Merge pull request #1513 from nickvergessen/ticket/11582
Ticket/11582 Split permission logic from translations
2013-07-22 11:28:55 -07:00
Andy Chase
cc1aef47fb [ticket/11620] Changes for code guidelines consistency
PHPBB3-11620
2013-07-22 11:13:31 -07:00
asperous
25b189d33b [ticket/11620] Cleanup creation_test that was renamed on a cherry-pick
PHPBB3-11620
2013-07-22 11:07:47 -07:00
asperous
30f198c61a [ticket/11620] Update auth_provider for new interface
PHPBB3-11620
2013-07-22 11:07:46 -07:00
asperous
7dbd85ad02 [ticket/11620] Added garbage_collection_test
PHPBB3-11620
2013-07-22 11:07:45 -07:00
asperous
af3a4ee33a [ticket/11620] Fixed check_ban_test errors with cache and ban warning message
PHPBB3-11620
2013-07-22 11:07:45 -07:00
asperous
13e4271c50 [ticket/11620] Fixed a typo on check_ban_test
PHPBB3-11620
2013-07-22 11:07:44 -07:00
asperous
2d850ba7a8 [ticket/11620] Refactored check_isvalid_test to use session_test_case
Since the continue->isvalid refactoring is now in a branch with the
session_test_case framework, this test can be refactored to use that framework.

PHPBB3-11620
2013-07-22 11:07:43 -07:00
Andy Chase
e74abfaa2c [ticket/11615] Refactored isvalid test to be more imperative
Refactoring the continue/is_valid test to remove
the confusing data provider work around, while
still keeping redundancies down to a minimum.

PHPBB3-11615
2013-07-22 11:07:43 -07:00
Andy Chase
362480263c [ticket/11615] Rename continue -> check_isvalid for clarity
PHPBB3-11615
2013-07-22 11:07:42 -07:00
asperous
d533e8807c [ticket/11620] Added a test for checking if users are banned
PHPBB3-11620
2013-07-22 11:07:41 -07:00
asperous
016faad668 [ticket/11620] Remove typo in beginning of session_key_test
PHPBB3-11620
2013-07-22 11:07:40 -07:00
asperous
750ea77108 [ticket/11620] Typo in file name session_key_tests -> test
PHPBB3-11620
2013-07-22 11:07:40 -07:00
asperous
f5a09858d0 [ticket/11620] Added a session key reset test
PHPBB3-11620
2013-07-22 11:07:39 -07:00
asperous
f7da773c06 [ticket/11620] Added manual key test
PHPBB3-11620
2013-07-22 11:07:38 -07:00
Andy Chase
87e65224d4 [ticket/11620] Cherry-Pick merge tests from session-storage-cache
PHPBB3-11620
2013-07-22 11:07:17 -07:00
asperous
62d7a05700 [ticket/11620] Abstracted session setUp into a test_case class
When defining a database test case with a setUp function, it is important
to call the parent's setup function, because that is when the database is setup.

PHPBB3-11620
2013-07-22 10:53:52 -07:00
Nathan Guse
960c3bb4fb Merge pull request #1401 from marc1706/ticket/11531
[ticket/11531] Add basic set of functional tests for new avatar system
2013-07-22 10:25:32 -07:00
Marc Alexander
2eb32ef515 [ticket/11531] Check if uploaded avatar is properly displayed in tests
PHPBB3-11531
2013-07-22 13:38:19 +02:00
Andreas Fischer
8efca016fa Merge remote-tracking branch 'EXreaction/ticket/11707' into develop
* EXreaction/ticket/11707:
  [ticket/11707] Twig DEFINE not working as expected
2013-07-22 03:07:38 +02:00
Andreas Fischer
fb5c8957ec Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11720] Add functional test for submitting report as user
  [ticket/11720] Do not call $captcha->validate if $captcha is not set
2013-07-22 00:51:03 +02:00
Andreas Fischer
90e532430c Merge branch 'prep-release-3.0.12' into develop-olympus
* prep-release-3.0.12:
  [ticket/11720] Add functional test for submitting report as user
  [ticket/11720] Do not call $captcha->validate if $captcha is not set
2013-07-22 00:50:49 +02:00
Marc Alexander
865bf0db3d [ticket/11720] Add functional test for submitting report as user
The already existing functional tests were not ran as the filename was
missing the appended "_test".

PHPBB3-11720
2013-07-21 18:50:06 +02:00
Marc Alexander
e48f0555e9 [ticket/11531] Reduced amount of avatar functional tests to minimum
The tests were reduced to only test one case that should be correct and one
that should fail. Different test cases have been split up over the specific
test files for the acp groups, acp users, ucp groups, and ucp users page.

PHPBB3-11531
2013-07-20 14:36:38 +02:00
Nathaniel Guse
375976eb38 [ticket/11707] Twig DEFINE not working as expected
PHPBB3-11707
2013-07-19 14:12:28 -05:00
Nathaniel Guse
1c59ad87b0 [ticket/11718] Quick test for fixes in ELSEIF
PHPBB3-11718
2013-07-19 13:34:08 -05:00
Marc Alexander
96989e536d [ticket/11531] Use abstract class for avatar tests and unify test cases
PHPBB3-11531
2013-07-17 23:55:20 +02:00