diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-12-15 11:05:29 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-12-15 11:05:29 -0800 |
| commit | 0d48408dccd2b69754310cb3702ddfe705dbcd12 (patch) | |
| tree | a49d066809ea58dc01acd38752d0566df602d719 /actionpack/lib/action_controller/assertions | |
| parent | 262fef7ed57520b857605a0105fe7ba9265654f6 (diff) | |
| parent | 4966076d35d5d9510590d87d90dae8daf79b2069 (diff) | |
| download | rails-0d48408dccd2b69754310cb3702ddfe705dbcd12.tar.gz rails-0d48408dccd2b69754310cb3702ddfe705dbcd12.tar.bz2 rails-0d48408dccd2b69754310cb3702ddfe705dbcd12.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_controller/assertions')
| -rw-r--r-- | actionpack/lib/action_controller/assertions/selector_assertions.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/assertions/selector_assertions.rb b/actionpack/lib/action_controller/assertions/selector_assertions.rb index e03fed7abb..248ca85994 100644 --- a/actionpack/lib/action_controller/assertions/selector_assertions.rb +++ b/actionpack/lib/action_controller/assertions/selector_assertions.rb @@ -587,7 +587,7 @@ module ActionController def response_from_page_or_rjs() content_type = @response.content_type - if content_type && content_type =~ /text\/javascript/ + if content_type && Mime::JS =~ content_type body = @response.body.dup root = HTML::Node.new(nil) |