Commit Graph

423 Commits

Author SHA1 Message Date
Dan Poltawski 47dfdfcfbe MDL-48624 behat: fix trailing whitespace 2015-02-03 11:02:48 +00:00
Rajesh Taneja 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
Andrew Nicols d02eaee727 Revert "Merge branch 'wip-mdl-48624-m27' of https://github.com/rajeshtaneja/moodle into MOODLE_27_STABLE"
This reverts commit 85ea64f5ee, reversing
changes made to 1db2e142a2.
2015-01-22 12:17:17 +08:00
Rajesh Taneja 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
Tim Hunt 2b982b0a66 MDL-42519 qformat_xml: Correctly export questions containing ]]> 2014-12-22 19:47:43 +00:00
Rajesh Taneja 67e7d60b56 MDL-48290 behat: Add log out after checking exported file
If the download step is the last in the scenario then we
can sometimes run into the situation where the download page
causes a http redirect but behat has already conducted its
reset (generating an error). By putting a logout step we avoid
behat doing the reset until we are off that page.
2014-12-02 09:39:52 +08:00
Dan Poltawski cf599bc889 MDL-48276 qformat_xhtml: avoid uncessary html in .css file
In order to help automated tools move the html out of the css
file.
2014-11-19 05:56:16 +00:00
Tim Hunt 898f7f9eab MDL-47710 qformat_gift: fix bahat fails due to different ids in exports 2014-10-16 11:04:44 +01:00
Dan Poltawski 60f462b19d MDL-47497 qformat_gift: fix bad backported behat test 2014-10-09 13:24:24 +01:00
Tim Hunt da1e9ff3af MDL-47497 qformats gift and xml: basic test of export.
Really, this is just to test the new behat setps, as much as anything.

Note that the details of what is written to the export files is tested in
the unit tests.
2014-10-08 19:54:07 +08:00
Tim Hunt df9589e32c MDL-47381 qformat: Behat tests have wrong plugin type. 2014-09-26 11:30:41 +01:00
Eloy Lafuente (stronk7) d9016fd581 MDL-47180 qformat_webct: whitespace cleanup 2014-09-24 00:58:04 +02:00
Jean-Michel Vedrine ba50cd880c MDL-47180 qformat_webct: Import of calculated questions broken 2014-09-23 14:47:36 +02:00
Dan Poltawski b5ecf0dbae Merge branch 'MDL-46195_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE 2014-09-15 16:07:09 +01:00
Dan Poltawski e7697e57f7 Merge branch 'MDL-46331_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE 2014-09-15 12:18:56 +01:00
Tim Hunt 3bafe8d0c4 MDL-46331 GIFT question import was breaking content inside <pre>.
Also, adding a Behat tests to verify GIFT import works without errors
(but leaving the detailed testing for the unit tests).
2014-09-09 22:59:20 +01:00
Tim Hunt 074aec1846 MDL-47167 XML question format: behat tests 2014-09-09 22:57:00 +01:00
Tim Hunt aef4661635 MDL-46195 WebCT question import: Behat test 2014-09-09 22:54:42 +01:00
Tim Hunt aec38d6b33 MDL-46195 fix error handling. 2014-09-08 22:26:33 +01:00
Tim Hunt c73d96bc91 MDL-46195 Fix fractionsaddwrong string component in lesson & qformat_webct.
I know. You should not refer to strings from other plugins, but

* qformat_webct is importing multichoice questions in that bit of code.
  I suppose a pedant would say that qformat_webct should declare dependencies
  on all the qtypes it relies on, but that would be silly.

* Lesson should be using the question engine, rather than doing its own thing.
2014-09-08 21:57:51 +01:00
Tim Hunt b760c63189 MDL-46308 qformat_xml: fix import of broken calculated questions.
Questions like this should not exist, of course. But they do, so we
should avoid generating errors in this case.
2014-08-08 17:59:15 +01:00
Tim Hunt 94ac7a87fa MDL-46148 qtype_calculated: fix validation when importing.
In order to do this in a sane way, I cleaned up a lot of old mess,
inclduing:

1. Previously, qtype_calcuated used ->answeres when importing, and
->answer when saving the form. This was crazy, so I fixed it, and
stripped out the code that made the alternative variable name work.

2. Similarly, it could handle ->answer being either an array, such as
you would get form the HTML editor, or a simple string, which is what
you get form the form. I simplified that too.

3. Finally, I made import use a transaction around saving each
question, so we don't get half questions in the database when an error
occurs.
2014-07-09 14:11:38 +01:00
Eloy Lafuente (stronk7) 538bf99ece MDL-45486 Bump all versions to planned release
This bumps all versions to planned 2.7 release
(2014051200) version and all the dependencies to
current 2.7rc2 (2014050800)
2014-05-09 02:12:28 +02:00
Dan Poltawski d08598bc8b Merge branch 'MDL-35103' of git://github.com/jmvedrine/moodle 2014-02-18 13:39:08 +08:00
Jean-Michel Vedrine 624ff5ba57 MDL-42033 Files in subdirs not exported correctly by question XML format 2014-02-16 19:37:09 +01:00
Jean-Michel Vedrine 4c23a70b03 MDL-35103 Fix various phpdocs for question formats 2014-02-16 19:09:26 +01:00
Tim Hunt 5c0b5ba575 MDL-43809 qformat_xml messes up $s in multianswer questions. 2014-01-23 15:26:38 +00:00
Kyle Temkin a4f765eb1d MDL-39756 add advanced attachment options to essay question type
Adds a set of options to the essay question type which implement
the following new features:

-Adds an input format which accepts only file uploads, and no
 inline text.
-Adds an option to make the inline text response optional when
 attachments are enabled, so students can choose to upload
 an essay file.
-Adds an option to make attachments required, so essays without
 attachments will be marked incomplete.
2014-01-15 12:43:04 -05:00
Eloy Lafuente (stronk7) f39c82ebed MDL-42701 Bump all versions near 2.6 release 2013-11-05 02:36:00 +01:00
Adam Olley 910051b798 MDL-41600: qformat_blackboard_six Fix test_import_match fail w/ddmatch
With qtype_ddmatch installed, the unit tests for qformat_blackboard_six
fail as they generate ddmatch questions instead of match ones. This
patch checks for ddmatch and changes the test to expect that instead if
its installed.
2013-09-10 09:16:51 +09:30
Dan Poltawski 942a0e37d4 Merge branch 'MDL-39507' of git://github.com/timhunt/moodle 2013-08-13 09:52:35 +08:00
Tim Hunt e2b388c1a4 MDL-39507 questions: fix pluginfile URLs before format_text.
This commit build's on Jean-Michel's work, tidying up a few lose ends.
2013-08-12 10:32:02 +01:00
Jean-Michel Vedrine 6c23d0d403 MDL-39507 questions: fix pluginfile URLs before format_text. 2013-08-08 10:05:48 +01:00
Jean-Michel Vedrine 398dc6a3ab MDL-30001 WEBCT Import does not work for 2.0 2013-08-08 07:43:43 +02:00
Petr Škoda 2f1e464a88 MDL-40438 migrate all collatorlib:: and textlib:: uses 2013-08-06 21:04:35 +02:00
Jean-Michel Vedrine d2fd7262af MDL-39404 Update question/format files to match codechecker standards 2013-07-26 21:32:34 +02:00
Dan Poltawski a3f92b2e0e Revert "MDL-26511 Images in Cloze multichoice"
This reverts commit feec4f8941.
2013-06-11 11:38:34 +08:00
ppichet feec4f8941 MDL-26511 Images in Cloze multichoice
vertical and horizontal answer and in feedback of all qtype answers
2013-06-10 11:28:46 +08:00
Eloy Lafuente (stronk7) cedb0aab5a MDL-39434 Bump all versions near 2.5 release 2013-05-01 18:03:29 +02:00
Jamie Pratt 397acdfda2 MDL-39230 Question bank - refactor xml import
Allow for reuse of code to read xml questions.
2013-04-30 11:38:26 +08:00
Dan Poltawski ba26ed9cac Merge branch 'MDL-39283' of git://github.com/jmvedrine/moodle 2013-04-24 14:33:00 +01:00
Jean-Michel Vedrine b31d6664e6 MDL-39283 GIFT and XML question export broken for unsupported qtypes
Do no write any data to the export for unsupported qtypes
2013-04-23 09:42:53 +02:00
Sam Hemelryk c26f34baf1 Merge branch 'MDL-39172' of git://github.com/jmvedrine/moodle 2013-04-22 11:02:39 +12:00
Jean-Michel Vedrine b48193383f MDL-39172 Import of .dat files is broken in blackboard_six import format 2013-04-18 17:39:13 +02:00
Jean-Michel Vedrine cdcda6a0b4 MDL-39164 GIFT, Blackboard and Examview import of essay questions broken 2013-04-18 17:36:18 +02:00
Jean-Michel Vedrine c80fb6d95e MDL-38880 Imported Cloze questions lose embedded images or other media 2013-04-11 16:22:20 +02:00
Dan Poltawski 95cd4369bb Merge branch 'MDL-19072' of git://github.com/jmvedrine/moodle 2013-04-10 14:10:37 +08:00
Dan Poltawski 998c5996e0 Merge branch 'MDL-38808' of git://github.com/jmvedrine/moodle 2013-04-03 14:46:58 +08:00
Damyon Wiese 6fb437b2bb Merge branch 'MDL-38705' of git://github.com/jonof/moodle 2013-04-03 14:35:12 +08:00
Jean-Michel Vedrine 60527d0c34 MDL-10516 Pre-populated answer (template) in essay questions 2013-04-03 11:30:42 +08:00