From 272094b8aa7c3b1dde8ef86b6a66e295e88e61ea Mon Sep 17 00:00:00 2001 From: Mark Nelson Date: Thu, 6 Jul 2017 16:36:54 +0800 Subject: [PATCH] MDL-59395 report_log: removed unnecessary Behat javascript tags Reverts the original fix for the failing Behat tests and solves it in a better way - it is now faster! Part of MDL-59290. --- report/log/tests/behat/filter_log.feature | 3 --- report/log/tests/behat/user_log.feature | 6 ++---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/report/log/tests/behat/filter_log.feature b/report/log/tests/behat/filter_log.feature index 3c571e1d705f2..6309bbb825890 100644 --- a/report/log/tests/behat/filter_log.feature +++ b/report/log/tests/behat/filter_log.feature @@ -17,7 +17,6 @@ Feature: In a report, admin can filter log data | student1 | C1 | student | And I log in as "admin" - @javascript Scenario: Filter log report for standard and legacy log reader Given I navigate to "Manage log stores" node in "Site administration > Plugins > Logging" And I click on "Enable" "link" in the "Legacy log" "table_row" @@ -42,7 +41,6 @@ Feature: In a report, admin can filter log data And I should see "user login" And I should not see "Nothing to display" - @javascript Scenario: Filter log report for standard log reader Given I am on "Course 1" course homepage And I navigate to course participants @@ -57,7 +55,6 @@ Feature: In a report, admin can filter log data And I press "Get these logs" Then I should see "User logged in as another user" - @javascript Scenario: Filter log report for legacy log reader Given I navigate to "Manage log stores" node in "Site administration > Plugins > Logging" And I click on "Enable" "link" in the "Legacy log" "table_row" diff --git a/report/log/tests/behat/user_log.feature b/report/log/tests/behat/user_log.feature index 4f4bb3421f2f0..e7afee2f7c555 100644 --- a/report/log/tests/behat/user_log.feature +++ b/report/log/tests/behat/user_log.feature @@ -33,19 +33,17 @@ Feature: User can view activity log. And I press "Save changes" And I log out - @javascript Scenario: View Todays' and all log report for user Given I log in as "teacher1" And I am on "Course 1" course homepage And I navigate to course participants - And I click on "img.userpicture" "css_element" in the "Student 1" "table_row" + And I follow "Student 1" When I follow "Today's logs" And I should see "Assignment: Test assignment name" And I follow "Student 1" And I follow "All logs" Then I should see "Assignment: Test assignment name" - @javascript Scenario: No log reader enabled should be visible when no log store enabled. Given I log in as "admin" And I navigate to "Manage log stores" node in "Site administration > Plugins > Logging" @@ -54,7 +52,7 @@ Feature: User can view activity log. And I log in as "teacher1" And I am on "Course 1" course homepage And I navigate to course participants - And I click on "img.userpicture" "css_element" in the "Student 1" "table_row" + And I follow "Student 1" When I follow "Today's logs" And I should see "No log reader enabled" And I follow "Student 1"