jquery example green

rdy · Oct 2, 2010 · c7272cc · c7272cc
1 parent 7ef28b2
commit c7272cc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/examples/jquery/spec/javascripts/TwitterApiSpec.js b/examples/jquery/spec/javascripts/TwitterApiSpec.js
@@ -17,7 +17,7 @@ describe("TwitterApi#search", function(){
       onFailWhale: onFailWhale
     });
 
-    request = mostRecentXhr();
+    request = mostRecentAjaxRequest();
   });
 
   it("calls Twitter with the correct url", function(){
@@ -49,7 +49,6 @@ describe("TwitterApi#search", function(){
 
   describe('on failure', function(){
     beforeEach(function(){
-      // simulateAjaxResponse(TestResponses.search.failure.status, TestResponses.search.failure.responseText, request);
       request.response(TestResponses.search.failure);
     });
 

diff --git a/examples/jquery/spec/javascripts/support/jasmine.yml b/examples/jquery/spec/javascripts/support/jasmine.yml
@@ -11,7 +11,8 @@
 #   - dist/**/*.js
 #
 src_files:
-    - public/javascripts/**/*.js
+    - frameworks/jquery.js
+    - examples/jquery/public/javascripts/**/*.js
 
 # stylesheets
 #
@@ -37,6 +38,8 @@ stylesheets:
 #   - helpers/**/*.js
 #
 helpers:
+  - lib/spec-helper.js
+  - examples/jquery/spec/javascripts/helpers/**/*.js
 
 # spec_files
 #
@@ -49,6 +52,8 @@ helpers:
 #   - **/*[sS]pec.js
 #
 spec_files:
+  - lib/mock-ajax.js
+  - examples/jquery/spec/javascripts/*.js
 
 # src_dir
 #
@@ -59,7 +64,7 @@ spec_files:
 #
 # src_dir: public
 #
-src_dir:
+src_dir: ../..
 
 # spec_dir
 #
@@ -70,4 +75,4 @@ src_dir:
 #
 # spec_dir: spec/javascripts
 #
-spec_dir:
+spec_dir: ../..