diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-09-10 07:05:17 -0700 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-09-10 07:05:17 -0700 |
| commit | 005b33222d5d6b6642402003a4e6d710ea456e42 (patch) | |
| tree | 862430af11b47ba4d2be12ba17ee5bbaff372f81 /activesupport/test | |
| parent | a46fa8df063e6ac1aea2bfdfffbf69cd28fef858 (diff) | |
| parent | 3dffe65d9151598d63ed14aca8773d205fdfe99d (diff) | |
| download | rails-005b33222d5d6b6642402003a4e6d710ea456e42.tar.gz rails-005b33222d5d6b6642402003a4e6d710ea456e42.tar.bz2 rails-005b33222d5d6b6642402003a4e6d710ea456e42.zip | |
Merge pull request #12173 from arunagw/fixes_reverted_by_revert_commit
Revert fixes
Diffstat (limited to 'activesupport/test')
| -rw-r--r-- | activesupport/test/xml_mini_test.rb | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/activesupport/test/xml_mini_test.rb b/activesupport/test/xml_mini_test.rb index a025279e16..d992028323 100644 --- a/activesupport/test/xml_mini_test.rb +++ b/activesupport/test/xml_mini_test.rb @@ -106,7 +106,11 @@ module XmlMiniTest module Nokogiri end setup do - @xml = ActiveSupport::XmlMini + @xml, @default_backend = ActiveSupport::XmlMini, ActiveSupport::XmlMini.backend + end + + teardown do + ActiveSupport::XmlMini.backend = @default_backend end test "#with_backend should switch backend and then switch back" do @@ -135,7 +139,11 @@ module XmlMiniTest module LibXML end setup do - @xml = ActiveSupport::XmlMini + @xml, @default_backend = ActiveSupport::XmlMini, ActiveSupport::XmlMini.backend + end + + teardown do + ActiveSupport::XmlMini.backend = @default_backend end test "#with_backend should be thread-safe" do |