From d5b5973326c95e81751e95f03049d10bfa54819a Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Sun, 14 Jun 2015 01:02:39 -0700 Subject: [PATCH] Merge branch 'interview' into staging Conflicts: app.js controllers/challenge.js seed/future-jquery-ajax-json.json --- challenges/basic-bonfires.json | 3 +- future-jquery-ajax-json.json | 374 ++++++++++++++++++++++++++++----- 2 files changed, 320 insertions(+), 57 deletions(-) diff --git a/challenges/basic-bonfires.json b/challenges/basic-bonfires.json index a6cf5aebf4..df4b6bc16c 100644 --- a/challenges/basic-bonfires.json +++ b/challenges/basic-bonfires.json @@ -46,9 +46,8 @@ "dashedName": "bonfire-meet-bonfire", "difficulty": "0", "description": [ - "Click the button below for further instructions.", "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.", "Make this function return true no matter what." ], diff --git a/future-jquery-ajax-json.json b/future-jquery-ajax-json.json index 97d0504f04..2a3a5d9cd7 100644 --- a/future-jquery-ajax-json.json +++ b/future-jquery-ajax-json.json @@ -1,73 +1,231 @@ { "name": "jQuery, Ajax and JSON", - "order" : 0.004, - "challenges": [ - { + "order": 0.004, + "challenges": [{ "id": "bad87fee1348bd9acdd08826", "name": "Waypoint: Learn how Script Tags and Document Ready Work", "difficulty": 0.072, "description": [ - "Test" + "We've simplified our Cat Photo App and removed our style element. Add a script element to your page and create a $(document).ready function within it.", + "Add $(document).ready(function() { to your script element, and then close it on the following line with });." ], "tests": [ - "assert(typeof $('#target').attr('disabled') === 'undefined', 'Change the disabled attribute of the \"target\" button to false');", - "expect($('#target')).to.exist()" + "assert(editor.match(/