Commit Graph

665 Commits

Author SHA1 Message Date
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
Marc Delisle
57ef25eed8 The DisableIS directive is being deprecated 2013-11-05 05:10:13 -05:00
Marc Delisle
8fd0d79405 The DisableIS directive is being deprecated 2013-11-03 09:55:39 -05:00
Madhura Jayaratne
f311c9c502 Remove trailing white spaces 2013-11-03 19:13:23 +05:30
Madhura Jayaratne
184316d891 Coding style fixes 2013-11-03 19:00:41 +05:30
Piotr Przybylski
858b20d26d Removed wiki links from setup script and user preferences 2013-11-03 13:07:22 +01:00
Piotr Przybylski
a67e41a646 Refactored ConfigFile class so that it is no longer a singleton
Fixes bug #4123 Double config including
2013-11-03 12:54:20 +01:00
Marc Delisle
d6488e2f58 Fix coding style 2013-10-21 03:40:52 -07:00
Piotr Przybylski
f8f43a10a7 Fix test on Windows 2013-10-20 23:24:32 +02:00
Madhura Jayaratne
5f72019a66 Fix failing tests 2013-10-19 13:02:43 +05:30
Marc Delisle
88da7eeba0 Fixes many coding style "line too long" 2013-10-17 05:41:51 -04:00
Madhura Jayaratne
490b4770e1 Mark the test as incomplete 2013-10-13 12:58:51 +05:30
Madhura Jayaratne
7119011693 Counting words is not really a good way of testing 2013-10-13 12:53:00 +05:30
Marc Delisle
c7e504b337 This test should use a numeric value 2013-10-11 12:57:46 -04:00
Dieter Adriaenssens
0aa7bba99f rename file with PMA_Font class tests 2013-09-30 14:07:41 +02:00
Dieter Adriaenssens
84aacaffbc add test for custom charlist 2013-09-30 14:04:28 +02:00
Mohamed Ashraf
a2659d7ba5 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into error_reporting
Conflicts:
	ChangeLog
2013-09-29 23:13:05 +02:00
Dieter Adriaenssens
2569fee671 move duplicate getStringWidth method to seperate class 2013-09-27 21:32:12 +02:00
Dieter Adriaenssens
07c850c2d6 fix coding style 2013-09-27 19:18:17 +02:00
Dieter Adriaenssens
85903d9672 add unit tests for PMA_SVG:getStringWidth() 2013-09-27 18:12:59 +02:00
Mohamed Ashraf
d90126ebd7 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into error_reporting
Conflicts:
	ChangeLog
	scripts/create-release.sh
2013-09-21 00:49:01 +02:00
Michal Čihař
805d28e85b Merge branch 'UT_import_sharp_files' of git://github.com/adamgsoc2013/phpmyadmin into adamgsoc2013-UT_import_sharp_files 2013-09-16 08:39:44 +02:00
Madhura Jayaratne
f98528a533 Merge branch 'QA_4_0'
Conflicts:
	test/classes/PMA_DisplayResults_test.php
2013-09-14 16:49:49 +05:30
Madhura Jayaratne
f4fce01443 Fix failing tests 2013-09-14 16:46:58 +05:30
adamgsoc2013
d3a87951de using a smaller test data to make it run more quick 2013-09-14 16:53:38 +08:00
adamgsoc2013
3d6f38223e move mock dbi code to setup function 2013-09-13 22:01:44 +08:00
adamgsoc2013
d9fe181553 add comment for DRIZZLE=false branch 2013-09-13 16:34:48 +08:00
adamgsoc2013
0e10ad4738 add Unit test case for import sharp files 2013-09-12 21:11:17 +08:00