From 367bcdf35ce46122cc1d76b82bd0998694dcc6ee Mon Sep 17 00:00:00 2001 From: "Cristian V. Nica" Date: Wed, 5 Aug 2015 21:55:25 +0300 Subject: [PATCH 01/12] Trying to fix: #1571 I have found a small typo on challenge: An Array Of new Information --- challenges/basic-javascript.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/challenges/basic-javascript.json b/challenges/basic-javascript.json index 0325880343..146693deef 100644 --- a/challenges/basic-javascript.json +++ b/challenges/basic-javascript.json @@ -423,7 +423,7 @@ "description": [ "", "In JavaScript we can store lists or collections of data in what are called arrays", - "Arrays are distinguished by the [ and ] around the data. Each piece of data is separated be a , ", + "Arrays are distinguished by the [ and ] around the data. Each piece of data is separated by a , ", "Now let's create a new array called myArray with a string and a number with a , separating each one", "Refer to the example if you get stuck", "" From 297838087602d3d835e23760e796777dc2e658df Mon Sep 17 00:00:00 2001 From: Samuel Plumppu Date: Wed, 5 Aug 2015 21:37:04 +0200 Subject: [PATCH 02/12] added test for object for steamroller bonfire --- challenges/intermediate-bonfires.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/challenges/intermediate-bonfires.json b/challenges/intermediate-bonfires.json index 5ae11fc7a4..c3f86b44c6 100644 --- a/challenges/intermediate-bonfires.json +++ b/challenges/intermediate-bonfires.json @@ -675,7 +675,8 @@ "tests": [ "assert.deepEqual(steamroller([[['a']], [['b']]]), ['a', 'b'], 'should flatten nested arrays');", "assert.deepEqual(steamroller([1, [2], [3, [[4]]]]), [1, 2, 3, 4], 'should flatten nested arrays');", - "assert.deepEqual(steamroller([1, [], [3, [[4]]]]), [1, 3, 4], 'should work with empty arrays');" + "assert.deepEqual(steamroller([1, [], [3, [[4]]]]), [1, 3, 4], 'should work with empty arrays');", + "assert.deepEqual(steamroller([1, {}, [3, [[4]]]]), [1, {}, 3, 4], 'should work with actual objects');" ], "MDNlinks": [ "Array.isArray()" From 9cb33e409c162c7714bf2bf4ff3b80c634846957 Mon Sep 17 00:00:00 2001 From: Berkeley Martinez Date: Wed, 5 Aug 2015 11:29:19 -0700 Subject: [PATCH 03/12] add loopbackMigrationGrandfathered flag --- loopbackMigration.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/loopbackMigration.js b/loopbackMigration.js index 333629438a..d167ccec8b 100644 --- a/loopbackMigration.js +++ b/loopbackMigration.js @@ -92,6 +92,8 @@ var users = dbObservable user.username = 'fcc' + uuid.v4().slice(0, 8); if (user.github) { user.isGithubCool = true; + } else { + user.isMigrationGrandfathered = true; } return user; }) From 241147a5c856fdef03458784beb339cb5db8f9ee Mon Sep 17 00:00:00 2001 From: "Cristian V. Nica" Date: Wed, 5 Aug 2015 23:22:37 +0300 Subject: [PATCH 04/12] Fixing #1575 Fixing small typo --- challenges/basic-javascript.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/challenges/basic-javascript.json b/challenges/basic-javascript.json index 0325880343..fd393264d3 100644 --- a/challenges/basic-javascript.json +++ b/challenges/basic-javascript.json @@ -677,7 +677,7 @@ "description":[ "", "A very important data type in javascript is the Object ", - " Objects a similar to arrays except that instead of using indexes to access and modify their data, Objects have what are called properties ", + " Objects are similar to arrays except that instead of using indexes to access and modify their data, Objects have what are called properties ", "Here's a sample Object", "", "var cat = {", From cb929cdba9bcf8f5eabb24f8617efe3a3797a44b Mon Sep 17 00:00:00 2001 From: "Rafael J. Rodriguez" Date: Wed, 5 Aug 2015 17:34:06 -0400 Subject: [PATCH 05/12] Fix for Issue #1540 --- challenges/intermediate-bonfires.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/challenges/intermediate-bonfires.json b/challenges/intermediate-bonfires.json index c3f86b44c6..4019e54af5 100644 --- a/challenges/intermediate-bonfires.json +++ b/challenges/intermediate-bonfires.json @@ -356,7 +356,7 @@ " return arr1;", "}", "", - "unite([1, 2, 3], [5, 2, 1, 4], [2, 1]);" + "unite([1, 3, 2], [5, 2, 1, 4], [2, 1]);" ], "tests": [ "assert.deepEqual(unite([1, 3, 2], [5, 2, 1, 4], [2, 1]), [1, 3, 2, 5, 4], 'should return the union of the given arrays');", From 55dd99067d1cafbdcee36dde38d803d688501a5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Floty=C5=84ski?= Date: Wed, 5 Aug 2015 23:53:45 +0200 Subject: [PATCH 06/12] Fixed tests in waypoint changes col-xs-12 to col-xs-6 so the tests works Issue #1578 --- challenges/bootstrap.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/challenges/bootstrap.json b/challenges/bootstrap.json index 5a89962f12..5c0ddb95a8 100644 --- a/challenges/bootstrap.json +++ b/challenges/bootstrap.json @@ -1883,7 +1883,7 @@ "Above your right-well, inside its \"col-xs-6\" div element, add a h4 element with the text \"#right-well\"." ], "tests": [ - "assert($('.col-xs-12').children('h4') && $('.col-xs-12').children('h4').length > 1, 'Add an h4 element to each of your <div class=\\'col-xs-6\\'> elements.');", + "assert($('.col-xs-6').children('h4') && $('.col-xs-6').children('h4').length > 1, 'Add an h4 element to each of your <div class=\\'col-xs-6\\'> elements.');", "assert(new RegExp('#left-well','gi').test($('h4').text()), 'One h4 element should have the text \"#left-well\".');", "assert(new RegExp('#right-well','gi').test($('h4').text()), 'One h4 element should have the text \"#right-well\".');" ], From 16add147e4805ef868d424022cf8e2d889d52994 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Floty=C5=84ski?= Date: Thu, 6 Aug 2015 00:20:52 +0200 Subject: [PATCH 07/12] first fixes - length larger _or equal_ to 1 I'm not sure if the tests are too vague - they allow to comment out way more than just the text specified - like the whole page.. --- challenges/bootstrap.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/challenges/bootstrap.json b/challenges/bootstrap.json index 5a89962f12..5cfb6f699d 100644 --- a/challenges/bootstrap.json +++ b/challenges/bootstrap.json @@ -2036,9 +2036,9 @@ "Add a comment at the top of your HTML that says You shouldn't need to modify code below this line." ], "tests": [ - "assert(editor.match(//g).length > 1, 'Be sure to close your comment with -->.')" + "assert(editor.match(//g).length >= 1, 'Be sure to close your comment with -->.')" ], "challengeSeed": [ "
", From 5bd6c6dc3fd6b73cfc5c5f799a44df93bb7a96a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Floty=C5=84ski?= Date: Thu, 6 Aug 2015 00:25:11 +0200 Subject: [PATCH 08/12] changed to agree with the style - greater than 0 instead of greater than or eqal to 1 --- challenges/bootstrap.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/challenges/bootstrap.json b/challenges/bootstrap.json index 5cfb6f699d..ba2869359a 100644 --- a/challenges/bootstrap.json +++ b/challenges/bootstrap.json @@ -2036,9 +2036,9 @@ "Add a comment at the top of your HTML that says You shouldn't need to modify code below this line." ], "tests": [ - "assert(editor.match(//g).length >= 1, 'Be sure to close your comment with -->.')" + "assert(editor.match(//g).length > 0, 'Be sure to close your comment with -->.')" ], "challengeSeed": [ "
", From 372b83d4f589058e0b185554a02534109272da15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Floty=C5=84ski?= Date: Thu, 6 Aug 2015 00:57:55 +0200 Subject: [PATCH 09/12] Fixed tests Added check if the object isn't null and escaped quotes because text enclosed apostrophe --- challenges/bootstrap.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/challenges/bootstrap.json b/challenges/bootstrap.json index ba2869359a..03c9ed18bd 100644 --- a/challenges/bootstrap.json +++ b/challenges/bootstrap.json @@ -2036,9 +2036,9 @@ "Add a comment at the top of your HTML that says You shouldn't need to modify code below this line." ], "tests": [ - "assert(editor.match(//g).length > 0, 'Be sure to close your comment with -->.')" + "assert(editor.match(//g) && editor.match(/-->/g).length > 0, 'Be sure to close your comment with -->.')" ], "challengeSeed": [ "
", From 528efe32c8f5e0b81e0480d83575cfe09779ae10 Mon Sep 17 00:00:00 2001 From: "Cristian V. Nica" Date: Thu, 6 Aug 2015 09:30:13 +0300 Subject: [PATCH 10/12] Fixing issue #1488 Correcting small mistakes in the waypoint instruction. --- challenges/jquery-ajax-and-json.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/challenges/jquery-ajax-and-json.json b/challenges/jquery-ajax-and-json.json index ed9c2c64c9..dad707f590 100644 --- a/challenges/jquery-ajax-and-json.json +++ b/challenges/jquery-ajax-and-json.json @@ -257,9 +257,9 @@ "dashedName": "waypoint-target-the-same-element-with-multiple-jQuery-Selectors", "difficulty": 3.06, "description": [ - "Now you know three ways of targeting elements: by type ($('button')), by class (($('.btn')), and by id (($'#target1')).", + "Now you know three ways of targeting elements: by type $('button'), by class $('.btn')), and by id $('#target1')).", "Use each of these jQuery selectors to target your button element with the class \"btn\" and the id \"target1\".", - "Use the addClass() jQuery function to give the element one new class for each selector: \"animated\", \"shake\", and \"button-primary\"." + "Use the addClass() jQuery function to give the element one new class for each selector: \"animated\", \"shake\", and \"btn-primary\"." ], "tests": [ "assert(editor.match(/\\$\\(\\'button\\'\\)/g), 'Use the $\\(\\'button\\'\\) selector.')", From 01b157f90a347e20050be8907b7288fddbf0d491 Mon Sep 17 00:00:00 2001 From: Martin Kwan Date: Thu, 6 Aug 2015 00:02:15 -0700 Subject: [PATCH 11/12] Updated Roman Numeral Challenge link Updated link so it would open in a new tab instead of the current tab. --- challenges/intermediate-bonfires.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/challenges/intermediate-bonfires.json b/challenges/intermediate-bonfires.json index 4019e54af5..f9c9be22d8 100644 --- a/challenges/intermediate-bonfires.json +++ b/challenges/intermediate-bonfires.json @@ -103,7 +103,7 @@ "difficulty": "2.02", "description": [ "Convert the given number into a roman numeral.", - "All roman numerals answers should be provided in upper-case.", + "All roman numerals answers should be provided in upper-case.", "Remember to use RSAP if you get stuck. Try to pair program. Write your own code." ], "challengeSeed": [ From d90bb6a4f4e2ca7bc61d3ca8f3a2850b0ef5c932 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Floty=C5=84ski?= Date: Thu, 6 Aug 2015 09:03:03 +0200 Subject: [PATCH 12/12] Fixed a few typos in javascript-basic --- challenges/basic-javascript.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/challenges/basic-javascript.json b/challenges/basic-javascript.json index 15afb5ab25..52aab20a55 100644 --- a/challenges/basic-javascript.json +++ b/challenges/basic-javascript.json @@ -503,7 +503,7 @@ "difficulty":"9.98171", "description":[ "", - "We are able to modify the data store in an array be using indexes", + "We are able to modify the data stored in an array by using indexes", "Example:", "", "var ourArray = [1,2,3];", @@ -536,10 +536,10 @@ "difficulty": "9.9818", "description": [ "", - "When and array has been defined we still have the ability to make changes to it afterwards", + "When an array has been defined we still have the ability to make changes to it afterwards", "One common way in which we can manipulate the data in an array is through .pop() ", - " .pop() is used to \"pop\" a value from the end of an array. We can retrieve this value by preforming the pop in a variable declaration.", - "any type of variable can be \"popped\" from and array", + " .pop() is used to \"pop\" a value from the end of an array. We can retrieve this value by performing the pop in a variable declaration.", + "Any type of variable can be \"popped\" from an array", "Let's try .pop() now" ], "tests": [ @@ -639,13 +639,13 @@ "description":[ "", "In JavaScript we can divide up our code into separate and reusable parts called functions", - "here's and example of a function", + "Here's an example of a function", "", "function functionName (a, b){", " return(a + b);", "}", "", - "our function can be called like this", + "Our function can be called like this", "functionName();", "Let's try creating and calling a function now called myFunction" ], @@ -688,7 +688,7 @@ "};", "", "Objects are useful for storing data in a structured way or in a way that represents a real world object like a cat.", - "Let's try to make a Object that represents a dog called myDog!" + "Let's try to make an Object that represents a dog called myDog!" ], "tests":[