diff options
| author | Yehuda Katz <wycats@gmail.com> | 2009-02-02 09:54:23 -0800 |
|---|---|---|
| committer | Yehuda Katz <wycats@gmail.com> | 2009-02-02 09:54:23 -0800 |
| commit | 44cdf0c5fe080d470429ab0640af25e927244907 (patch) | |
| tree | 0dcaa131da49eaeb0e056d0b4cc03673bf5af4c2 /actionpack/test/dispatch/request_test.rb | |
| parent | 3030bc90c95e335d726f06fd7a61ed96055e9109 (diff) | |
| download | rails-44cdf0c5fe080d470429ab0640af25e927244907.tar.gz rails-44cdf0c5fe080d470429ab0640af25e927244907.tar.bz2 rails-44cdf0c5fe080d470429ab0640af25e927244907.zip | |
Some merge cleanup
Diffstat (limited to 'actionpack/test/dispatch/request_test.rb')
| -rw-r--r-- | actionpack/test/dispatch/request_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/dispatch/request_test.rb b/actionpack/test/dispatch/request_test.rb index 60f71f03ce..f1e052ff17 100644 --- a/actionpack/test/dispatch/request_test.rb +++ b/actionpack/test/dispatch/request_test.rb @@ -255,7 +255,7 @@ class RequestTest < ActiveSupport::TestCase end test "server software" do - assert_equal nil, @request.server_software(true) + assert_equal nil, @request.server_software @request.env['SERVER_SOFTWARE'] = 'Apache3.422' assert_equal 'apache', @request.server_software |