From 172d2e193728a246a1a66a840ce9cb1893862f11 Mon Sep 17 00:00:00 2001 From: totembeing Date: Mon, 28 Aug 2023 21:24:49 +0530 Subject: [PATCH 1/3] Replaced r-rated words with words suitable for minors --- 1-js/05-data-types/03-string/2-check-spam/solution.md | 8 ++++---- 1-js/05-data-types/03-string/2-check-spam/task.md | 9 ++++----- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/1-js/05-data-types/03-string/2-check-spam/solution.md b/1-js/05-data-types/03-string/2-check-spam/solution.md index de8dde57d3..405d38257a 100644 --- a/1-js/05-data-types/03-string/2-check-spam/solution.md +++ b/1-js/05-data-types/03-string/2-check-spam/solution.md @@ -1,14 +1,14 @@ To make the search case-insensitive, let's bring the string to lower case and then search: ```js run demo -function checkSpam(str) { +function checkVerb(str) { let lowerStr = str.toLowerCase(); - return lowerStr.includes('viagra') || lowerStr.includes('xxx'); + return lowerStr.includes('move') || lowerStr.includes('swim'); } -alert( checkSpam('buy ViAgRA now') ); -alert( checkSpam('free xxxxx') ); +alert( checkSpam('You Should Move') ); +alert( checkSpam('I am going for a swim') ); alert( checkSpam("innocent rabbit") ); ``` diff --git a/1-js/05-data-types/03-string/2-check-spam/task.md b/1-js/05-data-types/03-string/2-check-spam/task.md index 98b5dd8a04..aad3c9901d 100644 --- a/1-js/05-data-types/03-string/2-check-spam/task.md +++ b/1-js/05-data-types/03-string/2-check-spam/task.md @@ -2,15 +2,14 @@ importance: 5 --- -# Check for spam +# Check for verb -Write a function `checkSpam(str)` that returns `true` if `str` contains 'viagra' or 'XXX', otherwise `false`. +Write a function `checkVerb(str)` that returns `true` if `str` contains 'move' or 'SWIM', otherwise `false`. The function must be case-insensitive: ```js -checkSpam('buy ViAgRA now') == true -checkSpam('free xxxxx') == true +checkSpam('You Should Move') == true +checkSpam('I am going for a swim') == true checkSpam("innocent rabbit") == false ``` - From 15a6c0a508e3073b0068ac4af593f14ea42c664d Mon Sep 17 00:00:00 2001 From: totembeing Date: Tue, 29 Aug 2023 00:36:01 +0530 Subject: [PATCH 2/3] Renamed 2-check-spam to 2-check-verb --- .../03-string/{2-check-spam => 2-check-verb}/_js.view/solution.js | 0 .../03-string/{2-check-spam => 2-check-verb}/_js.view/test.js | 0 .../03-string/{2-check-spam => 2-check-verb}/solution.md | 0 .../03-string/{2-check-spam => 2-check-verb}/task.md | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename 1-js/05-data-types/03-string/{2-check-spam => 2-check-verb}/_js.view/solution.js (100%) rename 1-js/05-data-types/03-string/{2-check-spam => 2-check-verb}/_js.view/test.js (100%) rename 1-js/05-data-types/03-string/{2-check-spam => 2-check-verb}/solution.md (100%) rename 1-js/05-data-types/03-string/{2-check-spam => 2-check-verb}/task.md (100%) diff --git a/1-js/05-data-types/03-string/2-check-spam/_js.view/solution.js b/1-js/05-data-types/03-string/2-check-verb/_js.view/solution.js similarity index 100% rename from 1-js/05-data-types/03-string/2-check-spam/_js.view/solution.js rename to 1-js/05-data-types/03-string/2-check-verb/_js.view/solution.js diff --git a/1-js/05-data-types/03-string/2-check-spam/_js.view/test.js b/1-js/05-data-types/03-string/2-check-verb/_js.view/test.js similarity index 100% rename from 1-js/05-data-types/03-string/2-check-spam/_js.view/test.js rename to 1-js/05-data-types/03-string/2-check-verb/_js.view/test.js diff --git a/1-js/05-data-types/03-string/2-check-spam/solution.md b/1-js/05-data-types/03-string/2-check-verb/solution.md similarity index 100% rename from 1-js/05-data-types/03-string/2-check-spam/solution.md rename to 1-js/05-data-types/03-string/2-check-verb/solution.md diff --git a/1-js/05-data-types/03-string/2-check-spam/task.md b/1-js/05-data-types/03-string/2-check-verb/task.md similarity index 100% rename from 1-js/05-data-types/03-string/2-check-spam/task.md rename to 1-js/05-data-types/03-string/2-check-verb/task.md From 6da8ac0858f17cee473c5f6a6f9d436c8befb86c Mon Sep 17 00:00:00 2001 From: totembeing Date: Tue, 29 Aug 2023 00:44:19 +0530 Subject: [PATCH 3/3] Updated solution.js and test.js for the r-rated words --- .../03-string/2-check-verb/_js.view/solution.js | 4 ++-- .../03-string/2-check-verb/_js.view/test.js | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/1-js/05-data-types/03-string/2-check-verb/_js.view/solution.js b/1-js/05-data-types/03-string/2-check-verb/_js.view/solution.js index 105d70eaef..fc137f3c8b 100644 --- a/1-js/05-data-types/03-string/2-check-verb/_js.view/solution.js +++ b/1-js/05-data-types/03-string/2-check-verb/_js.view/solution.js @@ -1,5 +1,5 @@ -function checkSpam(str) { +function checkVerb(str) { let lowerStr = str.toLowerCase(); - return lowerStr.includes('viagra') || lowerStr.includes('xxx'); + return lowerStr.includes('move') || lowerStr.includes('swim'); } \ No newline at end of file diff --git a/1-js/05-data-types/03-string/2-check-verb/_js.view/test.js b/1-js/05-data-types/03-string/2-check-verb/_js.view/test.js index 85eb24fcb9..6279430b0e 100644 --- a/1-js/05-data-types/03-string/2-check-verb/_js.view/test.js +++ b/1-js/05-data-types/03-string/2-check-verb/_js.view/test.js @@ -1,13 +1,13 @@ -describe("checkSpam", function() { - it('finds spam in "buy ViAgRA now"', function() { - assert.isTrue(checkSpam('buy ViAgRA now')); +describe("checkVerb", function() { + it('finds verb in "You Should Move"', function() { + assert.isTrue(checkVerb('You Should Move')); }); - it('finds spam in "free xxxxx"', function() { - assert.isTrue(checkSpam('free xxxxx')); + it('finds verb in "I am going for a swim"', function() { + assert.isTrue(checkVerb('I am going for a swim')); }); - it('no spam in "innocent rabbit"', function() { - assert.isFalse(checkSpam('innocent rabbit')); + it('no verb in "innocent rabbit"', function() { + assert.isFalse(checkVerb('innocent rabbit')); }); }); \ No newline at end of file