86d20a95c8
Revert "Merge branch 'MDL-49154_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE"
...
This reverts commit e0312ddb49636eb3726c
2015-02-19 09:18:40 +08:00
e0312ddb49
Merge branch 'MDL-49154_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE
2015-02-17 23:47:13 +01:00
98e374b38f
Merge branch 'MDL-49205_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE
2015-02-17 22:19:04 +01:00
e9265276b8
Merge branch 'MDL-49059-split_27' of https://github.com/pauln/moodle into MOODLE_27_STABLE
2015-02-17 20:59:03 +01:00
00ce45b9aa
Merge branch 'MDL-47529-27' of git://github.com/FMCorz/moodle into MOODLE_27_STABLE
2015-02-16 11:56:08 +08:00
c33fdb5834
MDL-47529 task: Do not use lock when updating task records
2015-02-16 11:14:05 +08:00
2a7241b3a1
MDL-49205 behat: fix I set the field with xpath fail message.
2015-02-13 16:16:27 +00:00
f65b1f10ad
MDL-49059 medialib: Add test cases for invalid Youtube URL param values
...
Tests to ensure that we're not allowing injection via invalid values of
the Youtube start time and playlist parameters.
2015-02-13 09:49:16 +13:00
85a61d783e
MDL-49059 medialib: Add tests for Youtube videos within playlists
...
As well as embedding playlists, you can embed specific videos from them -
resulting in the playlist UI displaying, but starting with the specified
video rather than the first in the playlist. These URLs should be covered
by the tests to ensure that we're handling them properly.
2015-02-13 09:49:15 +13:00
48b7540b31
MDL-49059 medialib: Add test cases for Youtube start times
...
Add test cases to core_medialib_testcase to cover YouTube videos with
start times.
2015-02-13 09:49:15 +13:00
3d3b2669c9
MDL-49154 behat: step to type with focus on a given element
2015-02-12 20:15:52 +00:00
a84ea4944a
Merge branch 'wip-mdl-48624-m27' of https://github.com/rajeshtaneja/moodle into MOODLE_27_STABLE
2015-02-03 11:01:58 +00:00
4d70a24d32
Merge branch 'tgz_fixing27' of https://github.com/tlevi/moodle into MOODLE_27_STABLE
2015-02-03 16:04:30 +08:00
b6fcba4636
MDL-48624 behat: Added extended timeout to ensure step pass
...
following_should_download_between_and_bytes step sometimes
fails because of server speed. Added extended timout
ensuring they wait enough before failing.
Also, not calling force download while running behat site
2015-01-30 08:55:54 +08:00
edcb9e619f
MDL-48924 backup: Fix some get_file_packer() calls for enabletgzbackups
2015-01-29 22:53:01 +10:30
0289be1321
MDL-48980 Security: Always clean the result from min_get_slash_argument
...
The result from this function is used in send_file calls and if unclean
(windows dir separators, or .. path components) it could expose sensitive
files (e.g. .php files). Now we always clean the result from this function
even if it means double cleaning.
I also fixed the unit test for this function and added a new test for this cleaning.
I also updated the comments to point to get_file_argument as the full version of
min_get_slash_argument.
2015-01-28 14:38:01 +08:00
7956f0c3af
MDL-48685 core_useragent: Correct IE 5.0 issues
2015-01-27 08:37:18 +08:00
f53e024291
MDL-48685 tests: Add testing for supports_json_contenttype
2015-01-27 08:37:18 +08:00
3f4c39004d
MDL-48685 tests: Add additional User Agents
...
* Firefox 33; Mac OS X 10.10
* Chrome 39; Mac OS X
* Safari; iPhone 6 Plus; iOS 8.1; Build 12B411
* Opera 12.15 (Build 1748); Mac OS X
2015-01-27 08:37:18 +08:00
a0adb4195e
MDL-48685 tests: Rewrite useragent tests
2015-01-27 08:37:18 +08:00
d02eaee727
Revert "Merge branch 'wip-mdl-48624-m27' of https://github.com/rajeshtaneja/moodle into MOODLE_27_STABLE"
...
This reverts commit 85ea64f5ee1db2e142a2
2015-01-22 12:17:17 +08:00
e47d85fadb
Merge branch 'wip-mdl-48761-m27' of https://github.com/rajeshtaneja/moodle into MOODLE_27_STABLE
2015-01-21 10:22:35 +08:00
68e1853422
MDL-48761 behat: Added new step for debugging scenarios
2015-01-21 10:18:25 +08:00
41be0b4e02
Merge branch 'MDL-48859_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE
2015-01-20 18:09:20 +01:00
5f5c2b846d
MDL-48624 behat: Added extended timeout to ensure step pass
...
following_should_download_between_and_bytes step sometimes
fails because of server speed. Added extended timout
ensuring they wait enough before failing.
Also, not calling force download while running behat site
2015-01-19 10:19:27 +08:00
c8410c245c
MDL-43835 behat: Added new step to set field with xpath defined
2015-01-15 11:35:19 +00:00
69d0012088
Merge branch 'MDL-43679-27' of git://github.com/FMCorz/moodle into MOODLE_27_STABLE
2015-01-05 15:49:28 +00:00
848e0ced2d
MDL-43679 core: Handle Meridio user agents with MS Word
2015-01-02 11:23:40 +08:00
55f193d531
MDL-43679 core_useragent: add test cases for MS Word
...
The new is_msword() check should always return false for regular browsers.
It should return true for known MS Word, but false for known MS Outlook.
2015-01-02 11:23:40 +08:00
6a2cd3d21d
MDL-48653 behat: fix incorrect phpdoc
2014-12-22 13:13:55 +00:00
a163de2fa8
Merge branch 'MDL-48653_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE
2014-12-22 13:10:48 +00:00
0cb5521993
MDL-48653 behat: Steps to click and dismiss a dialogue.
...
We already had the corresponding
I click on "Home" "link" confirming the dialogue
but I needed the opposite
I click on "Home" "link" dismissing the dialogue
2014-12-18 19:31:17 +00:00
bc79a75d50
Merge branch 'MDL-44829_MOODLE_27_STABLE' of git://github.com/BenKelada/moodle into MOODLE_27_STABLE
2014-12-17 10:11:44 +00:00
40287b3c30
MDL-44829 libraries: Update android user agent detection
2014-12-17 16:38:10 +11:00
195c33fcf3
MDL-48495 curl: Limit usage of curl to HTTP and HTTPS protocols
2014-12-16 10:08:54 +00:00
d70814b233
Merge branch 'MDL-48318-27' of git://github.com/lameze/moodle into MOODLE_27_STABLE
2014-12-16 16:42:19 +08:00
5e9b48a351
Merge branch 'wip-mdl-48426-m27' of https://github.com/rajeshtaneja/moodle into MOODLE_27_STABLE
2014-12-09 12:13:32 +13:00
b60fb27879
MDL-48373 behat: generators for questions and categories
2014-12-05 12:19:17 +00:00
af33173512
MDL-48373 behat: find table columns better.
...
It was not possible to select the question bank 'Created by'
or 'Modified by' columns without this change.
2014-12-05 12:19:17 +00:00
a9326881bf
MDL-48318 behat: Fixed JS Exception
...
M is not created on all pages, like cron and
Steps which check for exported data. So we need
to ensure M is defined, before using it in
behat_hooks::wait_for_pending_js()
2014-12-05 11:49:50 +08:00
71b1aefcf6
MDL-48374 behat: Added missing $session
2014-12-04 13:26:58 +01:00
d17de5db94
MDL-48374 behat: Check flag before searching for span on page
2014-12-04 13:26:58 +01:00
4ef9c95b97
MDL-48374 behat: improved page load detection
...
Check that page load detection was correctly started before testing that a
new page was loaded.
Without this, it is possible to have mutliple subsequent cases of:
And a new page should have loaded since I started watching
Without first starting the page load detection.
2014-12-04 13:26:58 +01:00
20f629e84d
Merge branch '48374-27' of git://github.com/samhemelryk/moodle into MOODLE_27_STABLE
2014-12-04 13:26:56 +01:00
36f4c617b1
Merge branch 'MDL-40419-27-2nd' of git://github.com/FMCorz/moodle into MOODLE_27_STABLE
2014-12-04 13:26:55 +01:00
fd6dab3d50
MDL-48374 behat: improved page load exceptions
...
The following improvements have been made to the page load watching:
* Improved the exceptions when a page load expectation fails.
* Added an exception if start watching happens twice without a page load.
* Improved the page load span and xpath to make it faster and less likely
to interfer in the future.
2014-12-02 11:44:06 +13:00
8fbf748b27
MDL-48374 behat: new steps for detecting page loads.
2014-12-02 08:58:19 +13:00
1c6e42379e
MDL-48426 behat: soft-reset mink session before scenario
2014-12-01 12:40:38 +08:00
96d699b4d8
MDL-40419 blocks: Function to get page type patterns from pattern
2014-11-27 16:19:54 +08:00
70554009a3
Merge branch 'MDL-23839-27' of git://github.com/andrewnicols/moodle into MOODLE_27_STABLE
2014-11-25 14:07:16 +13:00
Andrew Nicols