Merge branch 'MDL-48682_master' of git://github.com/dmonllao/moodle

This commit is contained in:
Dan Poltawski 2015-03-10 08:25:30 +00:00
commit 1151c0cd8b
3 changed files with 3 additions and 1 deletions

View File

@ -982,7 +982,7 @@ class behat_general extends behat_base {
* Example: I change window size to "small" or I change window size to "1024x768"
*
* @throws ExpectationException
* @Then /^I change window size to "([^"](small|medium|large|\d+x\d+))"$/
* @Then /^I change window size to "(small|medium|large|\d+x\d+)"$/
* @param string $windowsize size of the window (small|medium|large|wxh).
*/
public function i_change_window_size_to($windowsize) {

View File

@ -131,6 +131,7 @@ Feature: In an assignment, teacher can annotate PDF files during grading
And I follow "View/grade all submissions"
And I click on "Grade" "link" in the "Student 2" "table_row"
And I follow "Launch PDF editor..."
And I change window size to "large"
And I click on ".stampbutton" "css_element"
And I click on ".drawingcanvas" "css_element"
And I click on "Close" "button"

View File

@ -53,6 +53,7 @@ Feature: In a group assignment, teacher can annotate PDF files for all users
And I follow "View/grade all submissions"
And I click on "Grade" "link" in the "Submitted for grading" "table_row"
And I follow "Launch PDF editor..."
And I change window size to "large"
And I click on ".navigate-next-button" "css_element"
And I click on ".stampbutton" "css_element"
And I click on ".drawingcanvas" "css_element"