Fix for regexp replacements used by verify steps (#126)

* Fix regex replaces in isomorphic verify step * Fix regex replaces in css2 verify step * Fix regex replaces in two more exercises
workshopper · Jun 24, 2017 · ef005a3 · ef005a3
1 parent 5ee75f9
commit ef005a3
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 28 deletions.
diff --git a/exercises/css2/exercise.js b/exercises/css2/exercise.js
@@ -95,13 +95,10 @@ function query(mode) {
             if (err) {
                 exercise.emit('fail', exercise.__('fail.connection', {address: url, message: err.message}));
             } else {
-                var data = _data.toString().replace(/data-react-checksum=".{1,20}"/, "");
-                while (data.match(/data-reactid=".{1,20}"/)) {
-                    data = data.replace(/data-reactid=".{1,20}"/, "");
-                }
-                while (data.match(/data-reactid=".{1,35}"/)) {
-                    data = data.replace(/data-reactid=".{1,35}"/, "");
-                }
+                var data = _data.toString().replace(/data-react-checksum="[^"]{1,20}"/, "");
+                data = data.replace(/data-reactroot=""/, "");
+                data = data.replace(/data-reactid="[^"]{1,35}"/gm, "");
+                data = data.replace(/data-reactid="[^"]{1,35}"/gm, "");
                 data = beautify_html(data, null);
                 stream.write(data);
             }

diff --git a/exercises/event/exercise.js b/exercises/event/exercise.js
@@ -95,13 +95,9 @@ function query(mode) {
             if (err) {
                 exercise.emit('fail', exercise.__('fail.connection', {address: url, message: err.message}));
             } else {
-                var data = _data.toString().replace(/data-react-checksum=".{1,20}"/, "");
-                while (data.match(/data-reactid=".{1,20}"/)) {
-                    data = data.replace(/data-reactid=".{1,20}"/, "");
-                }
-                while (data.match(/data-reactid=".{1,35}"/)) {
-                    data = data.replace(/data-reactid=".{1,35}"/, "");
-                }
+                var data = _data.toString().replace(/data-react-checksum="[^"]{1,20}"/, "");
+                data = data.replace(/data-reactroot=""/, "");
+                data = data.replace(/data-reactid="[^"]{1,35}"/gm, "");
                 data = beautify_html(data, null);
                 stream.write(data);
             }

diff --git a/exercises/isomorphic/exercise.js b/exercises/isomorphic/exercise.js
@@ -95,13 +95,10 @@ function query(mode) {
             if (err) {
                 exercise.emit('fail', exercise.__('fail.connection', {address: url, message: err.message}));
             } else {
-                var data = _data.toString().replace(/data-react-checksum=".{1,20}"/, "");
-                while (data.match(/data-reactid=".{1,20}"/)) {
-                    data = data.replace(/data-reactid=".{1,20}"/, "");
-                }
-                while (data.match(/data-reactid=".{1,35}"/)) {
-                    data = data.replace(/data-reactid=".{1,35}"/, "");
-                }
+                var data = _data.toString().replace(/data-react-checksum="[^"]{1,20}"/, "");
+                data = data.replace(/data-reactroot=""/, "");
+                data = data.replace(/data-reactid="[^"]{1,35}"/g, "");
+                data = data.replace(/data-reactid="[^"]{1,35}"/g, "");
                 data = beautify_html(data, null);
                 stream.write(data);
             }

diff --git a/exercises/prop_and_state/exercise.js b/exercises/prop_and_state/exercise.js
@@ -96,13 +96,10 @@ function query(mode) {
                 exercise.emit('fail', exercise.__('fail.connection', {address: url, message: err.message}));
                 return;
             } else {
-                var data = _data.toString().replace(/data-react-checksum=".{1,20}"/, "");
-                while (data.match(/data-reactid=".{1,20}"/)) {
-                    data = data.replace(/data-reactid=".{1,20}"/, "");
-                }
-                while (data.match(/data-reactid=".{1,35}"/)) {
-                    data = data.replace(/data-reactid=".{1,35}"/, "");
-                }
+                var data = _data.toString().replace(/data-react-checksum="[^"]{1,20}"/, "");
+                data = data.replace(/data-reactroot=""/, "");
+                data = data.replace(/data-reactid="[^"]{1,35}"/gm, "");
+                data = data.replace(/data-reactid="[^"]{1,35}"/gm, "");
                 data = beautify_html(data, null);
                 stream.write(data);
             }