diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2017-07-17 07:10:27 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-17 07:10:27 -0600 |
| commit | 404eceba8c8f0951407c2508567f6abefec76e4c (patch) | |
| tree | cb8c690084083b6aee4a70ad29c24c0050f88bed /actionpack/test/controller/routing_test.rb | |
| parent | e505bc8acd4448030fd4d2f85796bdb61d45a5b1 (diff) | |
| parent | fbade51248ea48db87703ba7418badbd3ed85e36 (diff) | |
| download | rails-404eceba8c8f0951407c2508567f6abefec76e4c.tar.gz rails-404eceba8c8f0951407c2508567f6abefec76e4c.tar.bz2 rails-404eceba8c8f0951407c2508567f6abefec76e4c.zip | |
Merge branch 'master' into make-reverse-merge-bang-order-consistent
Diffstat (limited to 'actionpack/test/controller/routing_test.rb')
| -rw-r--r-- | actionpack/test/controller/routing_test.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb index 56b39510bb..fefb84e095 100644 --- a/actionpack/test/controller/routing_test.rb +++ b/actionpack/test/controller/routing_test.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require "abstract_unit" require "controller/fake_controllers" require "active_support/core_ext/object/with_options" @@ -656,7 +658,7 @@ class LegacyRouteSetTests < ActiveSupport::TestCase assert_equal "/page/foo", url_for(rs, controller: "content", action: "show_page", id: "foo") assert_equal({ controller: "content", action: "show_page", id: "foo" }, rs.recognize_path("/page/foo")) - token = "\321\202\320\265\320\272\321\201\321\202" # 'text' in Russian + token = "\321\202\320\265\320\272\321\201\321\202".dup # 'text' in Russian token.force_encoding(Encoding::BINARY) escaped_token = CGI::escape(token) |