diff options
| author | Akira Matsuda <ronnie@dio.jp> | 2013-01-22 10:27:12 +0900 |
|---|---|---|
| committer | Akira Matsuda <ronnie@dio.jp> | 2013-01-22 10:27:12 +0900 |
| commit | 1e8d5e62c6c19dde238a6e17b135993b9c0e0cd6 (patch) | |
| tree | eb43f868fe0b02be09f52a9707e576c0bf84e9d0 /actionpack/test/controller/integration_test.rb | |
| parent | 5e4fb4da83c9ac2d986ed3813ea18c9eb6ddfc99 (diff) | |
| parent | 484a0fd7fce189655b006ec6ba0d193a97c030cb (diff) | |
| download | rails-1e8d5e62c6c19dde238a6e17b135993b9c0e0cd6.tar.gz rails-1e8d5e62c6c19dde238a6e17b135993b9c0e0cd6.tar.bz2 rails-1e8d5e62c6c19dde238a6e17b135993b9c0e0cd6.zip | |
Merge branch 'isolating_tests'
Now we're almost ready to remove this: https://github.com/rails/rails/blob/5294ad8/activesupport/lib/active_support/test_case.rb#L29
Diffstat (limited to 'actionpack/test/controller/integration_test.rb')
| -rw-r--r-- | actionpack/test/controller/integration_test.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb index e2239c05c7..72b882539c 100644 --- a/actionpack/test/controller/integration_test.rb +++ b/actionpack/test/controller/integration_test.rb @@ -751,13 +751,17 @@ class UrlOptionsIntegrationTest < ActionDispatch::IntegrationTest assert_equal "http://bar.com/foo", foos_url end - test "test can override default url options" do + def test_can_override_default_url_options + original_host = default_url_options.dup + default_url_options[:host] = "foobar.com" assert_equal "http://foobar.com/foo", foos_url get "/bar" assert_response :success assert_equal "http://foobar.com/foo", foos_url + ensure + ActionDispatch::Integration::Session.default_url_options = self.default_url_options = original_host end test "current request path parameters are recalled" do |