gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into coderbye

Browse Source 
Conflicts:
	seed_data/bonfires.json
This commit is contained in:
Michael Q Larson
2015-02-14 16:29:34 -08:00
parent 108b272879 20b37ac470
commit 5cc5623648
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
seed_data/bonfires.json
View File

@ -7,11 +7,12 @@
"Click the button below for further instructions.", "Click the button below for further instructions.",
"Your goal is to fix the failing test.", "Your goal is to fix the failing test.",
"First, run all the tests by clicking \"Run code\" or by pressing Control + Enter", "First, run all the tests by clicking \"Run code\" or by pressing Control + Enter",
"The failing test is in red. Fix the code so that all tests pass. Then you can move on to the next Bonfire." "The failing test is in red. Fix the code so that all tests pass. Then you can move on to the next Bonfire.",
"Make this function return true no matter what."
], ],
"tests": [ "tests": [
"expect(meetBonfire(\"test\")).to.be.a(\"boolean\");", "expect(meetBonfire()).to.be.a(\"boolean\");",
"expect(meetBonfire(\"test\")).to.be.true;" "expect(meetBonfire()).to.be.true;"
], ],
"challengeSeed": "function meetBonfire(argument) {\n // Good luck!\n console.log(\"you can read this function's argument in the developer tools\", argument);\n\n return false;\n}\n\n\n\nmeetBonfire(\"You can do this!\");" "challengeSeed": "function meetBonfire(argument) {\n // Good luck!\n console.log(\"you can read this function's argument in the developer tools\", argument);\n\n return false;\n}\n\n\n\nmeetBonfire(\"You can do this!\");"
}, },
@ -208,10 +209,17 @@
] ]
}, },
{ {
<<<<<<< HEAD
"_id": "a39963a4c10bc8b4d4f06d7e", "_id": "a39963a4c10bc8b4d4f06d7e",
"name": "Seek and Destroy", "name": "Seek and Destroy",
"difficulty": "1.60", "difficulty": "1.60",
"description": [ "description": [
=======
"_id":"a39963a4c10bc8b4d4f06d7e",
"name":"Seek and Destroy",
"difficulty":"1.60",
"description":[
>>>>>>> master
"Remove all values (last argument(s)) from an array (first argument) and return as a new array." "Remove all values (last argument(s)) from an array (first argument) and return as a new array."
], ],
"challengeSeed": "function destroyer(arr) {\n // Remove all the values\r\n return arr;\r\n}\n\ndestroyer([1, 2, 3, 1, 2, 3], 2, 3);", "challengeSeed": "function destroyer(arr) {\n // Remove all the values\r\n return arr;\r\n}\n\ndestroyer([1, 2, 3, 1, 2, 3], 2, 3);",