From 70b116062916ffaf8ae9786b95c3468bfd027ee1 Mon Sep 17 00:00:00 2001 From: Ben Pickles Date: Mon, 27 Sep 2010 22:24:55 +0100 Subject: [PATCH] Add some JSONP tests. --- lib/bundler.rb | 1 + test/app.rb | 22 ++++++++++++++++++++++ test/views/index.erb | 3 ++- 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/lib/bundler.rb b/lib/bundler.rb index 154d762..cdbd17b 100644 --- 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 index c70d109..b411d55 100644 --- 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 index b19f27c..b259911 100644 --- a/test/views/index.erb +++ b/test/views/index.erb @@ -21,9 +21,10 @@ + + -

js-model Tests