Commit Graph

692 Commits

Author SHA1 Message Date
Michal Čihař
3f9c963abe Merge remote-tracking branch 'origin/QA_4_1' 2014-03-03 09:28:55 +01:00
Michal Čihař
f95010d9c2 Merge pull request #981 from mebjas/QA_4_1
Testcases for PMA_ConfigTest modified
2014-03-03 09:28:00 +01:00
Dhananjay Nakrani
76c57710f0 Display session expiry msg after auto-redirect.
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
2014-03-03 11:49:17 +05:30
minhaz
34a11a06fb Testcase build failure fixed
Signed-off-by: A V Minhaz <minhazav@gmail.com>
2014-03-02 15:23:45 +05:30
minhaz
5b8bf48dad testCase bild fail fixed
Signed-off-by: A V Minhaz <minhazav@gmail.com>
2014-03-02 14:44:39 +05:30
minhaz
47dfc2e3f0 tearDown() function to unset GLOBALS used for this test
Signed-off-by: A V Minhaz <minhazav@gmail.com>
2014-03-02 13:43:38 +05:30
minhaz
f7b35e52ef Added testcase for testCheckPermissions()
Signed-off-by: A V Minhaz <minhazav@gmail.com>
2014-03-02 13:41:57 +05:30
minhaz
b32b8ade30 Test object unset on test completion
The tearDown() function was kept empty without releasing resources of current object

Signed-off-by: A V Minhaz <minhazav@gmail.com>
2014-03-01 04:42:51 +05:30
minhaz
f1529325ff coding style fix
Signed-off-by: A V Minhaz <minhazav@gmail.com>
2014-03-01 02:49:56 +05:30
Marc Delisle
d808194e2d Merge commit '5f93f45' 2014-02-28 15:15:31 -05:00
Marc Delisle
94cb1e11f8 Merge pull request #976 from sampathLiyanage/bugfixdbsearch
DB Search bug fix #4299
2014-02-28 15:11:48 -05:00
Sampath Liyanage
5f93f45c04 test failure fixed
Signed-off-by: Sampath Liyanage <plbsam@gmail.com>
2014-03-01 00:15:08 +05:30
Chirayu Chiripal
dec30ffd6d Feature Request #1460 Redirect to login page after session has expired
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
2014-02-27 17:45:46 +05:30
Michal Čihař
c189d3a410 Merge commit '501d25fe622a83826b0d57541eb4f2551c49f5af' 2014-02-27 10:54:40 +01:00
minhaz
501d25fe62 fixing build test and adding test cases
Test case added for testBlowfishDecrypt() and modified for testBlowfishEncrypt()
Signed-off-by: A V Minhaz <minhazav@gmail.com>
2014-02-27 14:46:57 +05:30
Michal Čihař
0e2b847f4e Honor URL separator in get_scripts parameters
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-02-27 09:12:49 +01:00
minhaz
495eda9df3 testBlowFishDecrypt() testcase added
Signed-off-by: A V Minhaz <minhazav@gmail.com>
2014-02-27 04:23:43 +05:30
Michal Čihař
7a325cf5ad Fix regexp to match
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-02-24 12:33:16 +01:00
Michal Čihař
b63ddb6b41 Test encoded binary output
Otherwise PHP sometimes refuses to match binary content using PCRE.

Signed-off-by: Michal Čihař <michal@cihar.com>
2014-02-24 11:59:41 +01:00
Michal Čihař
b485c6105c Remove blank lines from the end of PHP files (causing extra output)
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-02-24 10:57:21 +01:00
Michal Čihař
a62acc5bfa Merge remote-tracking branch 'origin/QA_4_1' 2014-02-19 14:32:20 +01:00
Michal Čihař
b91cc88d73 Fixed altering table to DOUBLE/FLOAT field 2014-02-19 14:31:09 +01:00
Jeff Chan
29ca1f7892 Use stable sort for removeProperty of OptionsPropertyGroup.
The original custom sort function is not stable, which causes
different results on HHVM. It now uses the default array_diff
function which is stable. Also updated an incorrect test.

Signed-off-by: Jeff Chan <jefftchan@gmail.com>
2014-02-12 03:07:27 +00:00
Marc Delisle
e8f14e0ac0 Merge pull request #897 from dhananjay92/bug#4237
Fix for bug#4237.
2014-02-07 12:37:33 -05:00
Dhananjay
0a18d86059 Fix for bug#4237.
Signed-off-by: Dhananjay <dhananjaynakrani@gmail.com>
2014-02-07 11:56:46 +05:30
Chanaka Indrajith
4457f40ef4 Support for export server/db/table without views
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
2014-02-06 23:03:04 +05:30
Chanaka Indrajith
55151381fa rfe-1403 : Support for export only triggers/stored procedures
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
2014-02-04 22:47:00 +05:30
Michal Čihař
396991a194 Merge remote-tracking branch 'origin/QA_4_1' 2014-02-03 09:01:55 +01:00
Michal Čihař
87bbb24496 Fix tescase for new parameter passed to recaptcha
Signed-off-by: Michal Čihař <mcihar@suse.cz>
2014-02-03 09:00:31 +01:00
Michal Čihař
0e5be0dff1 Fix test case expectations
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-02-02 12:27:32 +01:00
Michal Čihař
a4788a9c90 Adjust tests to new messages
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-02-02 11:42:42 +01:00
Madhura Jayaratne
cdd53ace21 Merge branch 'QA_4_1'
Conflicts:
	libraries/Util.class.php
	test/libraries/PMA_insert_edit_test.php
2014-01-29 23:30:33 +05:30
Madhura Jayaratne
c1c50b5944 Revert e8fa9e5335, ea0ad9d41c and f36fbfd4c6
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-01-29 23:06:43 +05:30
Chanaka Indrajith
2988aebc86 rfe-1483 : Export database without triggers
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
2014-01-28 23:09:59 +05:30
Marc Delisle
2a2d4cd2bb Fix merge conflict
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-27 12:48:11 -05:00
Sampath Liyanage
ea0ad9d41c unit tests updated. Some global variables were set in setup functions of some test files. one testing function with mockobjects was changed from once() to exactly(2) because the bug fix has made that function calls twice
Signed-off-by: Sampath Liyanage <plbsam@gmail.com>
2014-01-27 21:53:36 +05:30
Marc Delisle
3d72b1cc87 Fix typos
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-24 08:24:14 -05:00
Madhura Jayaratne
16587a8c6b Suffix files containing classes with .class.php file extension
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-01-22 18:19:48 +05:30
Madhura Jayaratne
9f2d8f47e4 Remove obsolete method
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-01-22 17:19:34 +05:30
Marc Delisle
8ae7c6935c Remove unused code
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-12 07:35:12 -05:00
Hugues Peccatte
f7d5da319e Fix coding style.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-01-09 18:22:11 +01:00
Marc Delisle
33b180e9d8 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2013-12-25 19:25:33 -05:00
Marc Delisle
edde7126ce Move functions to library file
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-25 09:18:29 -05:00
Hugues Peccatte
094313412d Fix file names.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2013-12-24 16:46:04 +01:00
Michal Čihař
5c0f090061 Skip test if curl extension is missing 2013-12-17 22:35:18 +01:00
Marc Delisle
4f612de31d Remove unneeded transformation
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-06 06:31:47 -05:00
Dieter Adriaenssens
0fe2acc424 Merge branch 'master' into string_width
Conflicts:
	test/classes/schema/Svg_test.php
2013-11-28 16:32:49 +01:00
J.M
1d5b248706 Add test case for Internet Explorer 11 detection 2013-11-21 20:40:42 +01:00
ptarjan
840f7b1215 Make unit tests friendlier to running independently 2013-11-20 14:43:55 -08:00
Marc Delisle
d8fd82a9f5 The DisableIS directive is removed 2013-11-05 12:44:04 -05:00