aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test/xml_mini_test.rb
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2013-08-17 21:38:53 +0530
committerVijay Dev <vijaydev.cse@gmail.com>2013-08-17 21:46:39 +0530
commitec8ef1e1055c4e1598da13f49d30261f07f4a9b4 (patch)
treed5450558358174f6963323061e25366246ff5801 /activesupport/test/xml_mini_test.rb
parentdba4c6fe539c24ec1beb106e34f37f3cd0632022 (diff)
downloadrails-ec8ef1e1055c4e1598da13f49d30261f07f4a9b4.tar.gz
rails-ec8ef1e1055c4e1598da13f49d30261f07f4a9b4.tar.bz2
rails-ec8ef1e1055c4e1598da13f49d30261f07f4a9b4.zip
Revert "Merge branch 'master' of github.com:rails/docrails"
This reverts commit 70d6e16fbad75b89dd1798ed697e7732b8606fa3, reversing changes made to ea4db3bc078fb3093ecdddffdf4f2f4ff3e1e8f9. Seems to be a code merge done by mistake.
Diffstat (limited to 'activesupport/test/xml_mini_test.rb')
-rw-r--r--activesupport/test/xml_mini_test.rb12
1 files changed, 2 insertions, 10 deletions
diff --git a/activesupport/test/xml_mini_test.rb b/activesupport/test/xml_mini_test.rb
index d992028323..a025279e16 100644
--- a/activesupport/test/xml_mini_test.rb
+++ b/activesupport/test/xml_mini_test.rb
@@ -106,11 +106,7 @@ module XmlMiniTest
module Nokogiri end
setup do
- @xml, @default_backend = ActiveSupport::XmlMini, ActiveSupport::XmlMini.backend
- end
-
- teardown do
- ActiveSupport::XmlMini.backend = @default_backend
+ @xml = ActiveSupport::XmlMini
end
test "#with_backend should switch backend and then switch back" do
@@ -139,11 +135,7 @@ module XmlMiniTest
module LibXML end
setup do
- @xml, @default_backend = ActiveSupport::XmlMini, ActiveSupport::XmlMini.backend
- end
-
- teardown do
- ActiveSupport::XmlMini.backend = @default_backend
+ @xml = ActiveSupport::XmlMini
end
test "#with_backend should be thread-safe" do