Commit graph

1098 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
5ecfa56512 Merge branch 'MDL-43911-master' of git://github.com/andrewnicols/moodle 2014-02-04 10:53:17 +01:00
Marina Glancy
e5fd05a368 Merge branch 'MDL-41754-master' of git://github.com/jamiepratt/moodle 2014-02-04 15:44:51 +08:00
Eloy Lafuente (stronk7)
d29b8f4342 Merge branch 'MDL-33064-master' of git://github.com/danpoltawski/moodle 2014-02-04 00:59:58 +01:00
Sam Hemelryk
7c8c6aa76b Merge branch 'wip-mdl-40911' of https://github.com/rajeshtaneja/moodle 2014-02-04 09:53:16 +13:00
Dan Poltawski
119cf17eec MDL-42882 upgrade: unit tests for root folders upgrade
Just verifying the original behaviour
2014-02-03 17:29:51 +08:00
Marina Glancy
c8e346f799 Merge branch 'w05_MDL-43905_m27_loginevents' of git://github.com/skodak/moodle 2014-02-03 15:17:18 +08:00
Marina Glancy
1b066c06c6 Merge branch 'MDL-43440-master' of git://github.com/mr-russ/moodle 2014-02-03 13:42:23 +08:00
Andrew Nicols
a964ead06d MDL-43911 Behat: Save dumps of the page content to disk on scenario failure 2014-02-02 20:34:10 +08:00
Tim Hunt
e06bb5f800 MDL-43926 Unit tests shouldn't assume only one category on install 2014-01-31 13:31:17 +00:00
Petr Škoda
54b1e0409c MDL-43905 fix update of user login times
There needs to be only one event during user login.
The timemodified field is not supposed to be updated during login.
2014-01-31 10:08:01 +08:00
Rajesh Taneja
140118e3e8 MDL-40911 events: replaced add_to_log with events for login failed 2014-01-30 12:12:02 +08:00
Rajesh Taneja
623a32e50d MDL-43736 Events: Updated unit test to test context not used in event 2014-01-29 11:39:50 +08:00
Sam Hemelryk
453d66b782 Merge branch 'MDL-25500-master-squashed' of git://github.com/damyon/moodle 2014-01-29 13:21:00 +13:00
James Pratt
eb50c6e198 MDL-43027 core progress : new method keeps track of progress internally 2014-01-27 17:51:09 +07:00
James Pratt
809fdb83b1 MDL-41754 (1) Progress tracking : moved from backup and restore to core 2014-01-27 17:45:50 +07:00
Damyon Wiese
9843e5ece5 MDL-25500 lock: New locking framework.
This locking system is designed to be used everywhere requiring
locking in Moodle. Each use of the locking system can be configured
to use a different type of locking (or the same type with a different
configuration).

The first supported lock types are memcache, memcached, file (flock),
db (specific handlers for pg, mysql and mariadb).
2014-01-27 10:04:18 +08:00
Russell Smith
74b63eae76 MDL-43440 unit testing: Use cmid in unit tests when it should be used.
instance is has been used instead of cmid.  This works as all id's are 1
in most cases, but not always.

accesslib_clear_all_caches_for_unit_testing was updated to clear the
$USER->access cache which would fail test when the wrong user's data was used.
2014-01-25 08:57:32 +11:00
Michael Aherne
780cf0a728 MDL-43440 unit tests Use correct cm identifier in unit tests 2014-01-25 08:56:43 +11:00
David Monllao
cca6f37389 MDL-43757 behat: Allowing the form field guesser to detect TinyMCE
It includes 2 more minor fixes:
- Escapes values sent to TinyMCE as it was breaking
  when values contained double quotes.
- Adding seconds to the screenshots directory to
  avoid using the same folder for multiple runs.
2014-01-24 15:06:12 +08:00
Dan Poltawski
88de0401ae MDL-33064 tests: remove code_test.php
This test was doing work which doesn't make sense as a unit test.
Perhaps the most sensible option would be to use a git hook. Here is
a replacement David Mudrák created:

$ cat .git/hooks/pre-commit
 #!/bin/bash

FOUND=$(git diff-index --cached -U0 HEAD -- | grep DONOTCOMMIT | wc -l)

if [[ $FOUND -gt 0 ]]; then
    echo "pre-commit hook: DONOTCOMMIT detected, commit not allowed"
    exit 1
fi
2014-01-23 16:03:59 +08:00
Petr Škoda
3345e24f4b MDL-43661 change event property level to edulevel
Level is a reserved word in sql, sorry.
2014-01-21 15:54:56 +08:00
Dan Poltawski
1db62f7ff4 Merge branch 'wip-MDL-41062-master' of git://github.com/marinaglancy/moodle 2014-01-20 15:29:15 +08:00
Marina Glancy
b35ef82f33 MDL-41062 gradebook: corrections to grade_item upgrade script, more tests 2014-01-20 12:26:14 +08:00
Mark Nelson
362b9a0465 MDL-40051 core_lib: replaced add_to_log call when failing to send email with an event 2014-01-19 18:30:40 -08:00
Dan Poltawski
2a9d7a42aa MDL-41062 gradebook: remove sortorder duplicates
* Upgrade function to remove duplicates from the grade item duplicates
  column. Duplicates were causing sorting to fail in some cases.
* Add some unit tests which simulate sort order duplicate data and
  verify that they have been removed.
2014-01-17 17:31:21 +08:00
Dan Poltawski
b19608d682 Merge branch 'MDL-40912_master' of https://github.com/markn86/moodle 2014-01-15 11:41:05 +08:00
Mark Nelson
001f09548d MDL-40912 coursecat: replaced 'hide' and 'show' add_to_log calls with an event 2014-01-14 19:24:15 -08:00
Mark Nelson
d86c7206aa MDL-40912 coursecat: replaced 'move' add_to_log calls with an event 2014-01-14 19:24:14 -08:00
Mark Nelson
c4cea8cb5d MDL-40912 coursecat: replaced 'update' add_to_log call with an event 2014-01-14 19:24:14 -08:00
Mark Nelson
03ea10e6d3 MDL-40912 coursecat: replaced 'add' add_to_log call with an event 2014-01-14 19:24:08 -08:00
David Monllao
4234011a1a MDL-43439 behat: Dir date without - separators 2014-01-15 09:17:44 +08:00
Dan Poltawski
852c34e509 Merge branch 'MDL-43619-master' of git://github.com/sammarshallou/moodle 2014-01-15 08:19:49 +08:00
Eloy Lafuente (stronk7)
75bdb2bfc7 Merge branch 'MDL-43439_master' of git://github.com/dmonllao/moodle 2014-01-15 00:03:34 +01:00
sam marshall
0f1882ed1f MDL-43619 Roles: reset_role_capabilities unit test, cache fix 2014-01-14 13:46:25 +00:00
David Monllao
5c0dfe32eb MDL-43439 behat: Save the screenshots to the specified location 2014-01-14 15:17:28 +08:00
David Monllao
14ebd16390 MDL-43584 behat: Removing DB calls from step definitions as much as possible
Old methods deprecated as the expected arguments
have changed.
2014-01-10 18:25:44 +08:00
Damyon Wiese
3ec07614ba MDL-43439: Behat - new $CFG param - behat_screenshot_after_failure 2014-01-10 17:54:53 +08:00
Dan Poltawski
267d4927b4 Merge branch 'MDL-43173_master' of git://github.com/dmonllao/moodle 2014-01-08 08:21:06 +08:00
Dan Poltawski
7d374cdf4a Merge branch 'w01_MDL-43510_m27_test404' of https://github.com/skodak/moodle 2014-01-07 17:28:15 +08:00
Dan Poltawski
25294dd466 MDL-43481 lib: minor cleanups to commands
And remove unused strings - thanks to Simon Coggins!
2014-01-07 15:48:06 +08:00
Dan Poltawski
6d0796942b Merge branch 'w01_MDL-43481_m27_passwords' of https://github.com/skodak/moodle 2014-01-07 15:46:59 +08:00
Dan Poltawski
4e5fb5bec1 Merge branch 'm27_MDL-40379_Prevent_Some_Mobile_Network_Providers_From_Modifying_Content' of https://github.com/scara/moodle 2014-01-07 12:42:33 +08:00
Dan Poltawski
812cc702ad Merge branch 'MDL-42995-master-3rd' of git://github.com/FMCorz/moodle 2014-01-07 11:51:15 +08:00
Frederic Massart
0a8b3583ca MDL-42995 libraries: Global function to strip pluginfile content 2014-01-06 09:29:25 +01:00
Damyon Wiese
5490662ade Merge branch 'MDL-41690-master' of git://github.com/danpoltawski/moodle
Conflicts:
	course/dnduploadlib.php
2014-01-06 15:48:31 +08:00
Dan Poltawski
07e78d935f MDL-41690 cm_info: deprecate various properties 2014-01-06 10:45:59 +08:00
David Monllao
afe9f42adb MDL-43173 behat: Thowing an exception if the JS is not ready 2014-01-03 11:27:54 +08:00
Petr Škoda
b1652d6b85 MDL-43510 fix 404 unit test server incompatibility 2013-12-29 15:28:14 +08:00
Matteo Scaramuccia
c3a3f54053 MDL-40379 Files Prevent mobile network providers from modifying content. 2013-12-28 13:56:19 +01:00
Petr Škoda
914499a340 MDL-36721 do not store passwords in config logs 2013-12-27 11:17:45 +08:00