L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-60537-master' of git://github.com/andrewnicols/moodle

Browse Source
This commit is contained in:
Jake Dallimore
2017-10-23 14:28:51 +08:00
parent 2f5284f5fb 345f23c984
commit ab94608ffb
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/tool/httpsreplace/tests/behat/httpsreplace.feature
+1 -1
View File
@@ -24,6 +24,6 @@ Feature: View the httpsreplace report
And I follow "HTTPS conversion tool"
And I press "Continue"
And I set the field "I understand the risks of this operation" to "1"
And I press "Perform replacement"
And I press "Perform conversion"
Then I should see "intentionally.unavailable"
And I should see "download.moodle.org"
calendar/tests/behat/calendar.feature
+4 -4
View File
@@ -136,9 +136,9 @@ Feature: Perform basic calendar functionality
| activity | course | idnumber | name | intro | timeopen | timeclose |
| choice | C1 | choice1 | Test choice | Test choice description | ##today## | ##today## |
When I follow "This month"
Then I should see "Choice Test choice open"
And I should see "Choice Test choice close"
When I click on "Choice Test choice open" "link"
Then I should see "Test choice opens"
And I should see "Test choice closes"
When I click on "Test choice opens" "link"
Then "Delete" "button" should not exist
And "Edit" "button" should not exist
And I should see "Open event"
@@ -147,7 +147,7 @@ Feature: Perform basic calendar functionality
Then I should see "Test choice"
And I am on "Course 1" course homepage
And I follow "This month"
When I click on "Choice Test choice close" "link"
When I click on "Test choice closes" "link"
Then "Delete" "button" should not exist
And "Edit" "button" should not exist
And I should see "Close event"