Add some JSONP tests.

benpickles · Sep 27, 2010 · 70b1160 · 70b1160
1 parent dcc7169
commit 70b1160
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 1 deletion.
diff --git a/lib/bundler.rb b/lib/bundler.rb
@@ -33,6 +33,7 @@ def files
           model_class_methods
           model_errors
           model_instance_methods
+          model_jsonp
           model_local_storage
           model_log
           model_rest

diff --git a/test/app.rb b/test/app.rb
@@ -1,8 +1,13 @@
 require 'rubygems'
 require 'sinatra'
+require 'rack/contrib'
 require 'json'
 require 'erb'
+
 require File.expand_path('../../lib/bundler', __FILE__)
+require File.expand_path('../../lib/jsonp', __FILE__)
+
+use Rack::JSONP
 
 def json!
   content_type 'application/json'
@@ -115,3 +120,20 @@ def json!
     :title => ['must do something else before deleting']
   })
 end
+
+get '/jsonp/posts' do
+  json!
+  JSON.generate([
+    { :title => 'a' },
+    { :title => 'b' }
+  ])
+end
+
+get '/jsonp/posts-slooow' do
+  sleep 2
+  json!
+  JSON.generate([
+    { :title => 'a' },
+    { :title => 'b' }
+  ])
+end
diff --git a/test/views/index.erb b/test/views/index.erb
@@ -21,9 +21,10 @@
 <script src="tests/model_callbacks.js"></script>
 <script src="tests/model_class_methods.js"></script>
 <script src="tests/model_errors.js"></script>
+<script src="tests/model_jsonp.js"></script>
+<script src="tests/model_local_storage.js"></script>
 <script src="tests/model_rest.js"></script>
 <script src="tests/model_uid.js"></script>
-<script src="tests/model_local_storage.js"></script>
 </head>
 <body>
 <h1 id="qunit-header">js-model Tests</h1>