Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp

This commit is contained in:
Quincy Larson
2015-06-23 11:42:41 -07:00
2 changed files with 2 additions and 8 deletions

View File

@ -231,13 +231,7 @@ module.exports = {
}, },
chat: function chat(req, res) { chat: function chat(req, res) {
if (req.user && req.user.progressTimestamps.length > 5) { res.redirect('//gitter.im/FreeCodeCamp/FreeCodeCamp');
res.redirect('http://freecodecamp.slack.com');
} else {
res.render('resources/chat', {
title: 'Watch us code live on Twitch.tv'
});
}
}, },
jobsForm: function jobsForm(req, res) { jobsForm: function jobsForm(req, res) {

View File

@ -79,7 +79,7 @@
"sym([1, 2, 3], [5, 2, 1, 4]);" "sym([1, 2, 3], [5, 2, 1, 4]);"
], ],
"tests": [ "tests": [
"expect(sym([1, 2, 3], [5, 2, 1, 4])).to.eqls([3, 5, 4])", "expect(sym([1, 2, 3], [5, 2, 1, 4])).to.eqls([3, 5, 4]);",
"assert.deepEqual(sym([1, 2, 5], [2, 3, 5], [3, 4, 5]), [1, 4, 5], 'should return the symmetric difference of the given arrays');", "assert.deepEqual(sym([1, 2, 5], [2, 3, 5], [3, 4, 5]), [1, 4, 5], 'should return the symmetric difference of the given arrays');",
"assert.deepEqual(sym([1, 1, 2, 5], [2, 2, 3, 5], [3, 4, 5, 5]), [1, 4, 5], 'should return an array of unique values');", "assert.deepEqual(sym([1, 1, 2, 5], [2, 2, 3, 5], [3, 4, 5, 5]), [1, 4, 5], 'should return an array of unique values');",
"assert.deepEqual(sym([1, 1]), [1], 'should return an array of unique values');" "assert.deepEqual(sym([1, 1]), [1], 'should return an array of unique values');"