From d743dd70cc4867b61ed61f64613cfacc0812c930 Mon Sep 17 00:00:00 2001 From: Andrew Nicols Date: Mon, 23 Oct 2017 08:25:55 +0800 Subject: [PATCH 1/2] MDL-60537 tool_httpsreplace: Fix behat following langstring --- admin/tool/httpsreplace/tests/behat/httpsreplace.feature | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/tool/httpsreplace/tests/behat/httpsreplace.feature b/admin/tool/httpsreplace/tests/behat/httpsreplace.feature index 82bbf590151..0b79d8ba5f2 100644 --- a/admin/tool/httpsreplace/tests/behat/httpsreplace.feature +++ b/admin/tool/httpsreplace/tests/behat/httpsreplace.feature @@ -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" From 345f23c9844d1adb392c9394bcab45db5bdc598d Mon Sep 17 00:00:00 2001 From: Andrew Nicols Date: Mon, 23 Oct 2017 08:26:24 +0800 Subject: [PATCH 2/2] MDL-60537 calendar: Fix behat following string changes --- calendar/tests/behat/calendar.feature | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/calendar/tests/behat/calendar.feature b/calendar/tests/behat/calendar.feature index f35f252ec7a..dea249504b9 100644 --- a/calendar/tests/behat/calendar.feature +++ b/calendar/tests/behat/calendar.feature @@ -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"