<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -5,9 +5,13 @@ require 'rubygems'
 require 'test/unit'
 require 'active_record'
 require 'active_record/fixtures'
-require 'rexml/document'
+require 'action_controller'
+require 'action_controller/test_process'
 require 'stringio'
 require 'hpricot'
+require &quot;with_xml&quot;
+require File.join(File.dirname(__FILE__), &quot;/../init&quot;)
+require File.join(File.dirname(__FILE__), '/fixtures', 'article')
 
 # gem install redgreen for colored test output
 begin require 'redgreen'; rescue LoadError; end
@@ -16,16 +20,12 @@ ActiveRecord::Base.configurations['test'] = YAML::load(IO.read(File.dirname(__FI
 ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + &quot;/debug.log&quot;)
 ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations['test'][ENV['DB'] || 'sqlite3'])
 
-require &quot;with_xml&quot;
-require &quot;#{File.dirname(__FILE__)}/../init&quot;
-
 load(File.dirname(__FILE__) + &quot;/schema.rb&quot;) if File.exist?(File.dirname(__FILE__) + &quot;/schema.rb&quot;)
 
-Test::Unit::TestCase.fixture_path = File.dirname(__FILE__) + &quot;/fixtures/&quot;
-$LOAD_PATH.unshift(Test::Unit::TestCase.fixture_path)
+FIXTURE_LOAD_PATH = File.join(File.dirname(__FILE__), '/fixtures/')
 
 class Test::Unit::TestCase #:nodoc:
-  
+
   def create_fixtures(*table_names)
     if block_given?
       Fixtures.create_fixtures(Test::Unit::TestCase.fixture_path, table_names) { yield }
@@ -33,42 +33,35 @@ class Test::Unit::TestCase #:nodoc:
       Fixtures.create_fixtures(Test::Unit::TestCase.fixture_path, table_names)
     end
   end
-  
+
   def assert_respond_to_all object, methods
     methods.each do |method|
       [method.to_s, method.to_sym].each { |m| assert_respond_to object, m }
     end
   end
 
-  # Turn off transactional fixtures if you're working with MyISAM tables in MySQL
-  self.use_transactional_fixtures = true
-  
-  # Instantiated fixtures are slow, but give you @david where you otherwise would need people(:david)
-  self.use_instantiated_fixtures  = false
-
-  # Add more helper methods to be used by all tests here...
 end
 
 def load_xml_article(filename)
-  dir = Test::Unit::TestCase.fixture_path  + &quot;articles/&quot;
+  dir = FIXTURE_LOAD_PATH  + &quot;articles/&quot;
   article = File.readlines(dir + filename).to_s
   article.chomp
 end
 
 module TagMatchers
- 
+
   class TagMatcher
- 
+
     def initialize(expected)
       @expected = expected
       @text     = nil
     end
- 
+
     def with_text(text)
       @text = text
       self
     end
- 
+
     def matches?(target)
       @target = target
       doc = Hpricot(target)
@@ -77,12 +70,12 @@ module TagMatchers
     end
 
   end
- 
+
   def has_tag(target, expression, text = nil)
     tag = TagMatcher.new(expression)
     tag.with_text(text) if text
     tag.matches?(target)
   end
- 
+
 end
 </diff>
      <filename>test/test_helper.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,12 +1,13 @@
 require File.expand_path(File.dirname(__FILE__) + &quot;/test_helper&quot;)
 
-class WithXmlTest &lt; Test::Unit::TestCase
-  fixtures :articles
+class WithXmlTest &lt; ActionController::TestCase
   include TagMatchers
 
   def test_field_override
-    article = articles(:magazine) # bind :heading, :to =&gt; [&quot;subject&quot;, &quot;title&quot;]
+    article = Article.new
+    article.heading = &quot;New Yorker&quot;
     assert_equal &quot;New Yorker&quot;, article.heading
+    # xml should override header
     magazine = load_xml_article(&quot;magazine.xml&quot;)  #title = &quot;The Washington Post&quot;
     article.from_xml(magazine)
     assert_equal &quot;The Washington Post&quot;, article.heading
@@ -39,7 +40,8 @@ class WithXmlTest &lt; Test::Unit::TestCase
   # calling from_xml
 
   def test_field_override
-    article = articles(:magazine) # bind :heading, :to =&gt; [&quot;subject&quot;, &quot;title&quot;]
+    article = Article.new
+    article.heading = &quot;New Yorker&quot;
     assert_equal &quot;New Yorker&quot;, article.heading
     magazine = load_xml_article(&quot;magazine.xml&quot;)  #title = &quot;The Washington Post&quot;
     article.from_xml(magazine)
@@ -98,7 +100,7 @@ class WithXmlTest &lt; Test::Unit::TestCase
   end
 
   def test_from_xml_with_multiple_nodes
-    article = articles(:magazine)
+    article = Article.new
     magazine = load_xml_article(&quot;magazine.xml&quot;)  #body = &quot;This is the content&quot;
     article.from_xml(magazine)
     assert_equal &quot;This is the content&quot;, article.body</diff>
      <filename>test/with_xml_test.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>f6d66aba1ed17c217f1b8283f157e37aeb7bcfdd</id>
    </parent>
  </parents>
  <author>
    <name>Matt Sears</name>
    <email>matt@mattsears.com</email>
  </author>
  <url>http://github.com/mattsears/with_xml/commit/f4fad85d5ced79fa86b0b5232f9325e501366669</url>
  <id>f4fad85d5ced79fa86b0b5232f9325e501366669</id>
  <committed-date>2009-05-25T18:25:52-07:00</committed-date>
  <authored-date>2009-05-25T18:25:52-07:00</authored-date>
  <message>Fix tests to work with Rails 2.3.2</message>
  <tree>7262ea08d5dc91e1a20ece88c9da87c1f00673cb</tree>
  <committer>
    <name>Matt Sears</name>
    <email>matt@mattsears.com</email>
  </committer>
</commit>
