Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging

challenges/basic-bonfires.json

@@ -1074,9 +1074,12 @@
       ],
       "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');",
-        "assert.deepEqual(unite([1, 3, 2], [1, [5]], [2, [4]]), [1, 3, 2, [5], [4]], 'should not flatten nested arrays');"
+        "assert.deepEqual(unite([1, 3, 2], [1, [5]], [2, [4]]), [1, 3, 2, [5], [4]], 'should not flatten nested arrays');",
+        "assert.deepEqual(unite([1, 2, 3], [5, 2, 1]), [1, 2, 3, 5], 'should correctly handle exactly two arguments');",
+        "assert.deepEqual(unite([1, 2, 3], [5, 2, 1, 4], [2, 1], [6, 7, 8]), [ 1, 2, 3, 5, 4, 6, 7, 8 ], 'should correctly handle higher numbers of arguments');"
       ],
       "MDNlinks": [
+        "Arguments object",
         "Array.reduce()"
       ],
       "challengeType": 5,

challenges/basic-javascript.json

@@ -1069,6 +1069,35 @@
       ],
       "challengeType": 1
     },
+    {
+      "id":"cf1111c1c13feddfaeb3bdef",
+      "name":"Inverting a Match",
+      "dashedName":"waypoint-inverting-a-match",
+      "difficulty":"9.987",
+      "description":[
+        "",
+        "Use <code>/\\S+/gi;</code> to match everything that ins't a space in the string",
+        "You can invert any match by using the uppercase version of the selector <code>\\s</code> versus <code>\\S</code> for example"
+      ],
+      "tests":[
+        "assert(test === 36, 'Your RegEx should have found seven spaces in the testString');",
+        "assert(editorValue.match(/\\/\\\\S\\/gi/gi), 'You should be using the following expression /\\S+/gi to find the spaces in the testString');"
+      ],
+      "challengeSeed":[
+        "var test = (function(){",
+        " var testString = \"How many spaces are there in this sentance.\";",
+        "",
+        "//Do Not Modify Above",
+        "",
+        " var expression = /.+/gi;",
+        "",
+        "//Do Not Modify Below",
+        "",
+        " return(testString.match(expression).length);",
+        "})();(function(){return(test);})();"
+      ],
+      "challengeType":1
+    },
     {
       "id":"cf1111c1c12feddfaeb9bdef",
       "name":"Creating a slots machine",
@@ -1080,7 +1109,7 @@
         "For this we will need to generate three random numbers between <code>1</code> and <code>5</code> to represent the possible values of each individual slot",
         "Store the three random numbers in <code>slotOne</code>, <code>slotTwo</code> and <code>slotThree</code>",
         "Generate the random numbers by using the system we used earlier in /challenges/random-whole-numbers-in-a-range",
-        "<code> Math.floor(Math.random() * (5 - 1 + 1)) + 1; </code>."
+        "<code> Math.floor(Math.random() * (5 - 1 + 1)) + 1; </code>"
       ],
       "tests":[
         "assert(typeof(runSlots($('.slot'))[0]) == 'number', 'SlotOne should be a random number');",