diff --git a/gulpfile.js b/gulpfile.js index af48fb9746..b8aa6ff0fb 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -126,7 +126,7 @@ gulp.task('serve', function(cb) { script: paths.server, ext: '.js .json', ignore: paths.serverIgnore, - exec: '%cd%/node_modules/.bin/babel-node', + exec: './node_modules/.bin/babel-node', env: { 'NODE_ENV': 'development', 'DEBUG': process.env.DEBUG || 'freecc:*' diff --git a/seed/challenges/basic-bonfires.json b/seed/challenges/basic-bonfires.json index 51bb15e0e2..eaf4afbddc 100644 --- a/seed/challenges/basic-bonfires.json +++ b/seed/challenges/basic-bonfires.json @@ -308,7 +308,7 @@ ], "tests": [ "expect(largestOfFour([[4, 5, 1, 3], [13, 27, 18, 26], [32, 35, 37, 39], [1000, 1001, 857, 1]])).to.be.a('array');", - "(largestOfFour([[4, 5, 1, 3], [13, 27, 18, 26], [32, 35, 37, 39], [1000, 1001, 857, 1]])).should.eql([5,27,39,1001]);", + "(largestOfFour([[13, 27, 18, 26], [4, 5, 1, 3], [32, 35, 37, 39], [1000, 1001, 857, 1]])).should.eql([27,5,39,1001]);", "assert(largestOfFour([[4, 9, 1, 3], [13, 35, 18, 26], [32, 35, 97, 39], [1000000, 1001, 857, 1]]).should.eql([9,35,97,1000000]));" ], "MDNlinks": [ @@ -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, diff --git a/seed/challenges/bootstrap.json b/seed/challenges/bootstrap.json index 6c3c9467be..ea01b15573 100644 --- a/seed/challenges/bootstrap.json +++ b/seed/challenges/bootstrap.json @@ -1569,7 +1569,7 @@ "Let's nest your h3 element within a div element with the class \"containter-fluid\"." ], "tests": [ - "assert($('div').hasClass('container-fluid'), 'Your div element should have the class \"row\"')", + "assert($('div').hasClass('container-fluid'), 'Your div element should have the class \"container-fluid\"')", "assert(editor.match(/<\\/div>/g) && editor.match(/
/g).length === editor.match(/
div elements has a closing tag.')" ], "challengeSeed": [ @@ -1837,7 +1837,7 @@ ], "tests": [ "assert($('#left-well') && $('#left-well').length > 0, 'Give your left \"well\" the id of \"left-well\".')", - "assert($('#left-well') && $('#left-well').length > 0, 'Give your right \"well\" the id of \"right-well\".')" + "assert($('#right-well') && $('#right-well').length > 0, 'Give your right \"well\" the id of \"right-well\".')" ], "challengeSeed": [ "
", diff --git a/seed/challenges/html5-and-css.json b/seed/challenges/html5-and-css.json index 1ef68d9dce..793ef6f8ce 100644 --- a/seed/challenges/html5-and-css.json +++ b/seed/challenges/html5-and-css.json @@ -1409,7 +1409,7 @@ ], "tests": [ "assert($('ul').length > 0, 'Create a ul element.')", - "assert($('li').length > 2, 'Add three li elements to your ul element.')", + "assert($('ul li').length > 2, 'You should have three li elements within your ul element.')", "assert(editor.match(/<\\/ul>/g) && editor.match(/
    /g).length === editor.match(/
      ul element has a closing tag.')", "assert(editor.match(/<\\/li>/g) && editor.match(/
    • /g) && editor.match(/<\\/li>/g).length === editor.match(/
    • /g).length, 'Make sure your li element has a closing tag.')" ], @@ -1483,8 +1483,8 @@ "tests": [ "assert($('ul').length > 0, 'You should have an ul element on your page.')", "assert($('ol').length > 0, 'You should have an ol element on your page.')", - "assert($('li').length > 5, 'You should have three li elements within your ul element.')", - "assert($('li').length > 5, 'You should have three li elements within your ol element.')", + "assert($('ul li').length > 2, 'You should have three li elements within your ul element.')", + "assert($('ol li').length > 2, 'You should have three li elements within your ol element.')", "assert(editor.match(/<\\/ul>/g) && editor.match(/<\\/ul>/g).length === editor.match(/
        /g).length, 'Make sure your ul element has a closing tag.')", "assert(editor.match(/<\\/ol>/g) && editor.match(/<\\/ol>/g).length === editor.match(/
          /g).length, 'Make sure your ol element has a closing tag.')", "assert(editor.match(/<\\/li>/g) && editor.match(/
        1. /g) && editor.match(/<\\/li>/g).length === editor.match(/
        2. /g).length, 'Make sure your li element has a closing tag.')" @@ -3720,14 +3720,14 @@ "difficulty": 1.63, "description": [ "Another way you can represent colors in CSS is by using RGB values.", - "RGB values look like this: rgb(0, 0, 0) for black and rgb(255, 255, 255) for white.", + "RGB values look like this: rgb(0, 0, 0) for black and rgb(255, 255, 255) for white.", "Instead of using six hexadecimal digits like you do with hex code, with RGB you specify the brightness of each color with a number between 0 and 255.", "If you do the math, 16 times 16 is 256 total values. So RGB, which starts counting from zero, has the exact same number of possible values as hex code.", "Let's replace the hex code in our body element's background color with the RGB value for black: rgb(0, 0, 0)" ], "tests": [ - "assert(editor.match(/rgb\\s*\\(\\s*0\\s*,\\s*0\\s*,\\s*0\\s*\\)/ig), 'Use RGB to give your body element the background-color of black. For example body: { color: rgb(0, 0, 0); }.')", - "assert($('body').css('background-color') === 'rgb(0, 0, 0)', 'Your body element's the background-color should be black.')" + "assert($('body').css('background-color') === 'rgb(0, 0, 0)', 'Give your body element the background-color of black.')", + "assert(editor.match(/rgb\\s*\\(\\s*0\\s*,\\s*0\\s*,\\s*0\\s*\\)/ig), 'Use RGB to give your body element the background-color of black. For example body: { color: rgb(0, 0, 0); }.')" ], "challengeSeed": [ "