From 616d96f61278600fad157ebcbc8be613ce3b425a Mon Sep 17 00:00:00 2001
From: Arthur <partylich@gmail.com>
Date: Sat, 14 Dec 2019 16:41:47 -0500
Subject: [PATCH] refactor: update trivial regex capture group find and replace
 challenge (#37768)

* refactor: replace trivial regex capture group challenge

Previous challenge could be completed without any capture groups. New
challenge requires 3 capture groups and 3 uses of the submatches in the
replacement.

resolves #17645

* test: validate at least 3 capture groups were used

Use solution from SO
(https://stackoverflow.com/questions/16046620/regex-to-count-the-number-of-capturing-groups-in-a-regex)
as suggested by @RandellDawson to count the number of capturing
groups, regardless of whether or not the regex in question solves the
broader problem.

Co-Authored-By: Randell Dawson <5313213+RandellDawson@users.noreply.github.com>

* refactor: more meaningful variable name

Co-Authored-By: Randell Dawson <5313213+RandellDawson@users.noreply.github.com>

* test: add parenthesized substring test

* test: ensure 3 uses of substring replacement

* refactor: reword instructions

* fix: minor grammar fix

Co-Authored-By: Manish Giri <manish.giri.me@gmail.com>

* refactor: elaborate wording in test
---
 ...re-groups-to-search-and-replace.english.md | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/curriculum/challenges/english/02-javascript-algorithms-and-data-structures/regular-expressions/use-capture-groups-to-search-and-replace.english.md b/curriculum/challenges/english/02-javascript-algorithms-and-data-structures/regular-expressions/use-capture-groups-to-search-and-replace.english.md
index ca4e5c88dc..084ebde896 100644
--- a/curriculum/challenges/english/02-javascript-algorithms-and-data-structures/regular-expressions/use-capture-groups-to-search-and-replace.english.md
+++ b/curriculum/challenges/english/02-javascript-algorithms-and-data-structures/regular-expressions/use-capture-groups-to-search-and-replace.english.md
@@ -28,7 +28,7 @@ You can also access capture groups in the replacement string with dollar signs (
 
 ## Instructions
 <section id='instructions'>
-Write a regex so that it will search for the string <code>"good"</code>. Then update the <code>replaceText</code> variable to replace <code>"good"</code> with <code>"okey-dokey"</code>.
+Write a regex <code>fixRegex</code> using three capture groups that will search for each word in the string "one two three". Then update the <code>replaceText</code> variable to replace "one two three" with the string "three two one" and assign the result to the <code>result</code> variable. Make sure you are utilizing capture groups in the replacement string using the dollar sign (<code>$</code>) syntax.
 </section>
 
 ## Tests
@@ -38,10 +38,17 @@ Write a regex so that it will search for the string <code>"good"</code>. Then up
 tests:
   - text: You should use <code>.replace()</code> to search and replace.
     testString: assert(code.match(/\.replace\(.*\)/));
-  - text: Your regex should change <code>"This sandwich is good."</code> to <code>"This sandwich is okey-dokey."</code>
-    testString: assert(result == "This sandwich is okey-dokey." && replaceText === "okey-dokey");
+  - text: Your regex should change <code>"one two three"</code> to <code>"three two one"</code>
+    testString: assert(result === "three two one");
   - text: You should not change the last line.
-    testString: assert(code.match(/result\s*=\s*huhText\.replace\(.*?\)/));
+    testString: assert(code.match(/result\s*=\s*str\.replace\(.*?\)/));
+  - text: <code>fixRegex</code> should use at least three capture groups.
+    testString: assert((new RegExp(fixRegex.source + '|')).exec('').length - 1 >= 3);
+  - text: <code>replaceText</code> should use parenthesized submatch string(s) (i.e. the nth parenthesized submatch string, $n, corresponds to the nth capture group).
+    testString: '{
+      const re = /(\$\d{1,2})+(?:[\D]|\b)/g;
+      assert(replaceText.match(re).length >= 3);
+    }'
 
 ```
 
@@ -53,10 +60,10 @@ tests:
 <div id='js-seed'>
 
 ```js
-let huhText = "This sandwich is good.";
+let str = "one two three";
 let fixRegex = /change/; // Change this line
 let replaceText = ""; // Change this line
-let result = huhText.replace(fixRegex, replaceText);
+let result = str.replace(fixRegex, replaceText);
 ```
 
 </div>
@@ -69,10 +76,10 @@ let result = huhText.replace(fixRegex, replaceText);
 <section id='solution'>
 
 ```js
-let huhText = "This sandwich is good.";
-let fixRegex = /good/g; // Change this line
-let replaceText = "okey-dokey"; // Change this line
-let result = huhText.replace(fixRegex, replaceText);
+let str = "one two three";
+let fixRegex = /(\w+) (\w+) (\w+)/g; // Change this line
+let replaceText = "$3 $2 $1"; // Change this line
+let result = str.replace(fixRegex, replaceText);
 ```
 
 </section>