From 737b54fe9e27e1cdb91c05221dcb34d54c2d4dc8 Mon Sep 17 00:00:00 2001
From: Damyon Wiese <damyon@moodle.com>
Date: Mon, 7 Nov 2016 14:23:46 +0800
Subject: [PATCH] MDL-55215 lesson: JS is required for some lesson behats

Lesson is using the searchselector which only supports JS - so some
tests need javascript tags.

Also fixed support for filling a passwordunmask field with JS enabled by
id.
---
 lib/behat/classes/partial_named_selector.php         | 2 +-
 mod/lesson/tests/behat/lesson_course_reset.feature   | 1 +
 mod/lesson/tests/behat/lesson_group_override.feature | 1 +
 mod/lesson/tests/behat/lesson_user_override.feature  | 3 ++-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/behat/classes/partial_named_selector.php b/lib/behat/classes/partial_named_selector.php
index 44338c17c38..1e0276f3d8f 100644
--- a/lib/behat/classes/partial_named_selector.php
+++ b/lib/behat/classes/partial_named_selector.php
@@ -190,7 +190,7 @@ XPATH
         ,
              'passwordunmask' => <<<XPATH
 .//*[@data-passwordunmask='wrapper']
-    /descendant::input[@id = //label[contains(normalize-space(string(.)), %locator%)]/@for]
+    /descendant::input[@id = %locator% or @id = //label[contains(normalize-space(string(.)), %locator%)]/@for]
 XPATH
         ],
     ];
diff --git a/mod/lesson/tests/behat/lesson_course_reset.feature b/mod/lesson/tests/behat/lesson_course_reset.feature
index b2691092372..e3fc2aad934 100644
--- a/mod/lesson/tests/behat/lesson_course_reset.feature
+++ b/mod/lesson/tests/behat/lesson_course_reset.feature
@@ -70,6 +70,7 @@ Feature: Lesson reset
     And I navigate to "Overview" node in "Lesson administration > Reports"
     Then I should see "No attempts have been made on this lesson"
 
+  @javascript
   Scenario: Use course reset to remove user overrides.
     When I follow "Test lesson name"
     And I navigate to "User overrides" node in "Lesson administration"
diff --git a/mod/lesson/tests/behat/lesson_group_override.feature b/mod/lesson/tests/behat/lesson_group_override.feature
index 868c078e1e3..412bdbe005f 100644
--- a/mod/lesson/tests/behat/lesson_group_override.feature
+++ b/mod/lesson/tests/behat/lesson_group_override.feature
@@ -288,6 +288,7 @@ Feature: Lesson user override
     Then I press "Continue"
     And I should see "Congratulations - end of lesson reached"
 
+  @javascript
   Scenario: Add both a user and group override and verify that both are applied correctly
     When I follow "Test lesson name"
     And I navigate to "Edit settings" node in "Lesson administration"
diff --git a/mod/lesson/tests/behat/lesson_user_override.feature b/mod/lesson/tests/behat/lesson_user_override.feature
index 90eb263e6f8..911a93ee836 100644
--- a/mod/lesson/tests/behat/lesson_user_override.feature
+++ b/mod/lesson/tests/behat/lesson_user_override.feature
@@ -1,4 +1,4 @@
-@mod @mod_lesson
+@mod @mod_lesson @javascript
 Feature: Lesson user override
   In order to grant a student special access to a lesson
   As a teacher
@@ -43,6 +43,7 @@ Feature: Lesson user override
       | id_jumpto_1          | This page |
     And I press "Save page"
 
+  @javascript
   Scenario: Add, modify then delete a user override
     When I follow "Test lesson name"
     And I navigate to "User overrides" node in "Lesson administration"