diff options
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | railties/test/application/assets_test.rb | 49 |
2 files changed, 27 insertions, 25 deletions
@@ -10,7 +10,8 @@ end gem "coffee-script" gem "sass" -gem "uglifier", :git => 'git://github.com/lautis/uglifier.git' +gem "uglifier", :git => "git://github.com/lautis/uglifier.git" +gem "rack", :git => "git://github.com/rack/rack.git" gem "rake", ">= 0.8.7" gem "mocha", ">= 0.9.8" diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb index 624dd2a23f..98a702f134 100644 --- a/railties/test/application/assets_test.rb +++ b/railties/test/application/assets_test.rb @@ -24,35 +24,36 @@ module ApplicationTests end RUBY + require "#{app_path}/config/environment" + get "/assets/demo.js" assert_match "alert()", last_response.body end test "does not stream session cookies back" do - puts "PENDING SPROCKETS AND RACK RELEASE" - # app_file "app/assets/javascripts/demo.js.erb", "<%= :alert %>();" - # - # app_file "config/routes.rb", <<-RUBY - # AppTemplate::Application.routes.draw do - # match '/omg', :to => "omg#index" - # end - # RUBY - # - # require "#{app_path}/config/environment" - # - # class ::OmgController < ActionController::Base - # def index - # flash[:cool_story] = true - # render :text => "ok" - # end - # end - # - # get "/omg" - # assert_equal 'ok', last_response.body - # - # get "/assets/demo.js" - # assert_match "alert()", last_response.body - # assert_equal nil, last_response.headers["Set-Cookie"] + app_file "app/assets/javascripts/demo.js.erb", "<%= :alert %>();" + + app_file "config/routes.rb", <<-RUBY + AppTemplate::Application.routes.draw do + match '/omg', :to => "omg#index" + end + RUBY + + require "#{app_path}/config/environment" + + class ::OmgController < ActionController::Base + def index + flash[:cool_story] = true + render :text => "ok" + end + end + + get "/omg" + assert_equal 'ok', last_response.body + + get "/assets/demo.js" + assert_match "alert()", last_response.body + assert_equal nil, last_response.headers["Set-Cookie"] end end end |