From 9e8fd80e44dbe18182bfbb4bbf349bf409adda1e Mon Sep 17 00:00:00 2001
From: David Baumgold <david@davidbaumgold.com>
Date: Mon, 9 Dec 2013 10:47:38 -0500
Subject: [PATCH 1/2] Re-enable AJAX Errors Course Overview JS test

This reverts commit fa1acae80d634494aaf053daf5ec9d131c425bfa.
---
 cms/static/coffee/spec/views/overview_spec.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cms/static/coffee/spec/views/overview_spec.coffee b/cms/static/coffee/spec/views/overview_spec.coffee
index 2082e4747bb7..cbc08212137a 100644
--- a/cms/static/coffee/spec/views/overview_spec.coffee
+++ b/cms/static/coffee/spec/views/overview_spec.coffee
@@ -328,7 +328,7 @@ define ["js/views/overview", "js/views/feedback_notification", "sinon", "js/base
                 )
                 expect($('#subsection-2')).not.toHaveClass('collapsed')
 
-        xdescribe "AJAX", ->
+        describe "AJAX", ->
             beforeEach ->
                 @requests = requests = []
                 @xhr = sinon.useFakeXMLHttpRequest()

From 397c5484ee0598aa5f1abc89becdc02a67771157 Mon Sep 17 00:00:00 2001
From: David Baumgold <david@davidbaumgold.com>
Date: Fri, 6 Dec 2013 16:19:28 -0500
Subject: [PATCH 2/2] modify course_info_spec fake XHR

Make it use sinon's fake XHR the same way the other tests do
---
 .../coffee/spec/views/course_info_spec.coffee | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/cms/static/coffee/spec/views/course_info_spec.coffee b/cms/static/coffee/spec/views/course_info_spec.coffee
index 1e843d59fbb0..656248684cd4 100644
--- a/cms/static/coffee/spec/views/course_info_spec.coffee
+++ b/cms/static/coffee/spec/views/course_info_spec.coffee
@@ -28,10 +28,9 @@ define ["js/views/course_info_handout", "js/views/course_info_update", "js/model
             setFixtures($("<script>", {id: "course_info_update-tpl", type: "text/template"}).text(courseInfoTemplate))
             appendSetFixtures courseInfoPage
 
-            courseUpdatesXhr = sinon.useFakeXMLHttpRequest()
-            @courseUpdatesRequests = requests = []
-            courseUpdatesXhr.onCreate = (xhr) -> requests.push(xhr)
-            @xhrRestore = courseUpdatesXhr.restore
+            @requests = requests = []
+            @xhr = sinon.useFakeXMLHttpRequest()
+            @xhr.onCreate = (xhr) -> requests.push(xhr)
 
             @collection = new CourseUpdateCollection()
             @collection.url = 'course_info_update/'
@@ -92,7 +91,7 @@ define ["js/views/course_info_handout", "js/views/course_info_update", "js/model
                     modalCover.click()
 
         afterEach ->
-            @xhrRestore()
+            @xhr.restore()
 
         it "does not rewrite links on save", ->
             # Create a new update, verifying that the model is created
@@ -109,7 +108,7 @@ define ["js/views/course_info_handout", "js/views/course_info_update", "js/model
             expect(model.save).toHaveBeenCalled()
 
             # Verify content sent to server does not have rewritten links.
-            contentSaved = JSON.parse(@courseUpdatesRequests[@courseUpdatesRequests.length - 1].requestBody).content
+            contentSaved = JSON.parse(@requests[@requests.length - 1].requestBody).content
             expect(contentSaved).toEqual('/static/image.jpg')
 
         it "does rewrite links for preview", ->
@@ -146,10 +145,9 @@ define ["js/views/course_info_handout", "js/views/course_info_update", "js/model
             setFixtures($("<script>", {id: "course_info_handouts-tpl", type: "text/template"}).text(handoutsTemplate))
             appendSetFixtures courseInfoPage
 
-            courseHandoutsXhr = sinon.useFakeXMLHttpRequest()
-            @handoutsRequests = requests = []
-            courseHandoutsXhr.onCreate = (xhr) -> requests.push(xhr)
-            @handoutsXhrRestore = courseHandoutsXhr.restore
+            @requests = requests = []
+            @xhr = sinon.useFakeXMLHttpRequest()
+            @xhr.onCreate = (xhr) -> requests.push(xhr)
 
             @model = new ModuleInfo({
                 id: 'handouts-id',
@@ -165,7 +163,7 @@ define ["js/views/course_info_handout", "js/views/course_info_update", "js/model
             @handoutsEdit.render()
 
         afterEach ->
-            @handoutsXhrRestore()
+            @xhr.restore()
 
         it "does not rewrite links on save", ->
             # Enter something in the handouts section, verifying that the model is saved
@@ -176,7 +174,7 @@ define ["js/views/course_info_handout", "js/views/course_info_update", "js/model
             @handoutsEdit.$el.find('.save-button').click()
             expect(@model.save).toHaveBeenCalled()
 
-            contentSaved = JSON.parse(@handoutsRequests[@handoutsRequests.length - 1].requestBody).data
+            contentSaved = JSON.parse(@requests[@requests.length - 1].requestBody).data
             expect(contentSaved).toEqual('/static/image.jpg')
 
         it "does rewrite links in initial content", ->
@@ -214,4 +212,4 @@ define ["js/views/course_info_handout", "js/views/course_info_update", "js/model
             expect($('.edit-handouts-form').is(':hidden')).toEqual(true)
             @handoutsEdit.$el.find('.edit-button').click()
             expect(@handoutsEdit.$codeMirror.getValue()).toEqual('<p><a href="[URL OF FILE]>[LINK TEXT]</a></p>')
-            expect($('.edit-handouts-form').is(':hidden')).toEqual(false)
\ No newline at end of file
+            expect($('.edit-handouts-form').is(':hidden')).toEqual(false)