<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -8,7 +8,7 @@ module BuildsHelper
     end
     options.unshift &quot;&lt;option value=''&gt;Older Builds...&lt;/option&gt;&quot;
     
-    select_tag &quot;build&quot;, options, :onChange =&gt; &quot;this.form.submit();&quot;
+    select_tag &quot;build&quot;, options.join, :onChange =&gt; &quot;this.form.submit();&quot;
   end
   
   def format_build_log(log)</diff>
      <filename>app/helpers/builds_helper.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,5 +1,5 @@
 &lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
-&lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD XHTML 1.0 Strict//EN&quot; &quot;http://www.w3.org/TR/2002/REC-xhtml1-20020801/DTD/xhtml1-strict.dtd&quot;&gt;
+&lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD XHTML 1.0 Strict//EN&quot; &quot;http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd&quot;&gt;
 &lt;html xmlns=&quot;http://www.w3.org/1999/xhtml&quot; xml:lang=&quot;en&quot; lang=&quot;en&quot;&gt;
 &lt;head&gt;
   &lt;title&gt;CruiseControl.rb&lt;%= @title ? &quot; - &quot; + @title : '' %&gt;&lt;/title&gt;</diff>
      <filename>app/views/layouts/application.html.erb</filename>
    </modified>
    <modified>
      <diff>@@ -62,9 +62,6 @@ require 'smtp_tls'
 require 'date'
 require 'fileutils'
 
-# custom MIME type for CCTray application
-Mime::Type.register &quot;application/cctray&quot;, :cctray
-
 # get rid of cached pages between runs
 FileUtils.rm_rf RAILS_ROOT + &quot;/public/builds&quot;
 FileUtils.rm_rf RAILS_ROOT + &quot;/public/documentation&quot;</diff>
      <filename>config/environment.rb</filename>
    </modified>
    <modified>
      <diff>@@ -3,3 +3,6 @@
 # Add new mime types for use in respond_to blocks:
 # Mime::Type.register &quot;text/richtext&quot;, :rtf
 # Mime::Type.register_alias &quot;text/html&quot;, :iphone
+
+# custom MIME type for CCTray application
+Mime::Type.register &quot;application/cctray&quot;, :cctray</diff>
      <filename>config/initializers/mime_types.rb</filename>
    </modified>
    <modified>
      <diff>@@ -25,7 +25,7 @@ class BuilderPlugin
   
   class &lt;&lt; self
     def known_event?(event_name)
-      self.instance_methods(false).include? event_name.to_s
+      self.instance_methods(false).map { |m| m.to_s }.include? event_name.to_s
     end
     
     def load_all</diff>
      <filename>lib/builder_plugins/builder_plugin.rb</filename>
    </modified>
    <modified>
      <diff>@@ -3,6 +3,8 @@ module SourceControl
 
     class Subversion::PropgetParser
       def parse(lines)
+        lines = lines.lines if lines.is_a?(String) &amp;&amp; lines.respond_to?(:lines)
+        
         directories = {}
         current_dir = nil
         lines.each do |line|
@@ -20,4 +22,3 @@ module SourceControl
     
   end
 end
-</diff>
      <filename>lib/source_control/subversion/propget_parser.rb</filename>
    </modified>
    <modified>
      <diff>@@ -11,13 +11,11 @@ class &lt;&lt; TimeFormatter
     today = now.beginning_of_day
     tomorrow = 1.day.since(today)
 
-    format =
-      case(time)
-      when Time.at(0)...this_year then '%d %b %y'
-      when this_year...today then '%d %b'
-      when today...tomorrow then '%H:%M'
-      else '%Y-%m-%d %H:%M:%S ?future?'
-      end
+    format = '%Y-%m-%d %H:%M:%S ?future?'
+    format = '%d %b %y' if time &gt;= Time.at(0) &amp;&amp; time &lt; this_year
+    format = '%d %b'    if time &gt;= this_year  &amp;&amp; time &lt; today
+    format = '%H:%M'    if time &gt;= today      &amp;&amp; time &lt; tomorrow
+
     remove_leading_zero(time.strftime(format))
   end
 </diff>
      <filename>lib/time_formatter.rb</filename>
    </modified>
    <modified>
      <diff>@@ -9,7 +9,7 @@ require 'optparse'
 CRUISE_OPTIONS = { :verbose =&gt; false }
 
 ARGV.options do |opts|
-  opts.banner = &quot;Usage: cruise builder &lt;project_name&gt; []options]&quot;
+  opts.banner = &quot;Usage: cruise builder &lt;project_name&gt; [options]&quot;
 
   opts.separator &quot;&quot;
 </diff>
      <filename>script/builder</filename>
    </modified>
    <modified>
      <diff>@@ -1,4 +1,3 @@
-require 'ftools'
 require 'fileutils'
 require 'test/unit/assertions'
 </diff>
      <filename>test/file_sandbox.rb</filename>
    </modified>
    <modified>
      <diff>@@ -14,7 +14,7 @@ class DocumentationControllerTest &lt; ActionController::TestCase
     assert_response :success
     assert_template 'documentation/docs'
     
-    assert_raises ActionView::MissingTemplate do
+    assert_raise ActionView::MissingTemplate do
       get :get, :path =&gt; 'bad_request'
     end
   end</diff>
      <filename>test/functional/documentation_controller_test.rb</filename>
    </modified>
    <modified>
      <diff>@@ -16,7 +16,7 @@ class SubversionIntegrationTest &lt; ActiveSupport::TestCase
 
     SourceControl::Subversion.new(:path =&gt; 'passing_project').latest_revision
     SourceControl::Subversion.new(:path =&gt; 'foo', :repository =&gt; fixture_repository_url).latest_revision
-    assert_raises { Subversion.new(:path =&gt; 'foo').latest_revision }
+    assert_raise { Subversion.new(:path =&gt; 'foo').latest_revision }
   end
   
   def test_up_to_date</diff>
      <filename>test/integration/subversion_integration_test.rb</filename>
    </modified>
    <modified>
      <diff>@@ -11,23 +11,10 @@ ActionMailer::Base.delivery_method = :test
 ActionMailer::Base.perform_deliveries = true
 
 class Test::Unit::TestCase
-  
-  def assert_raises(arg1 = nil, arg2 = nil)
-    expected_error = arg1.is_a?(Exception) ? arg1 : nil
-    expected_class = arg1.is_a?(Class) ? arg1 : nil
-    expected_message = arg1.is_a?(String) ? arg1 : arg2
-    begin 
-      yield
-      fail &quot;expected error was not raised&quot;
-    rescue Test::Unit::AssertionFailedError
-      raise
-    rescue =&gt; e
-      raise if e.message == &quot;expected error was not raised&quot;
-      assert_equal(expected_error, e) if expected_error
-      assert_equal(expected_class, e.class, &quot;Unexpected error type raised&quot;) if expected_class
-      assert_equal(expected_message, e.message, &quot;Unexpected error message&quot;) if expected_message.is_a? String
-      assert_match(expected_message, e.message, &quot;Unexpected error message&quot;) if expected_message.is_a? Regexp
-    end
+  def assert_raise_with_message(types, matcher, message = nil, &amp;block)
+    args = [types].flatten + [message]
+    exception = assert_raise(*args, &amp;block)
+    assert_match matcher, exception.message, message
   end
   
   def assert_false(expression)</diff>
      <filename>test/test_helper.rb</filename>
    </modified>
    <modified>
      <diff>@@ -29,7 +29,7 @@ class BuildMailerTest &lt; Test::Unit::TestCase
   
   private
     def read_fixture(action)
-      IO.readlines(&quot;#{FIXTURES_PATH}/build_mailer/#{action}&quot;)
+      IO.readlines(&quot;#{FIXTURES_PATH}/build_mailer/#{action}&quot;).join
     end
 
     def encode(subject)</diff>
      <filename>test/unit/build_mailer_test.rb</filename>
    </modified>
    <modified>
      <diff>@@ -27,7 +27,7 @@ class BuildSerializerTest &lt; Test::Unit::TestCase
     lock = AvailableLock.new
     FileLock.expects(:new).returns(lock)
 
-    assert_raises &quot;some exception&quot; do
+    assert_raise_with_message(RuntimeError, &quot;some exception&quot;) do
       @serializer.serialize { raise &quot;some exception&quot; }
     end
     
@@ -67,7 +67,7 @@ class BuildSerializerTest &lt; Test::Unit::TestCase
     @project.expects(:notify).with(:queued).once
     @project.expects(:notify).with(:timed_out).once
     FileLock.expects(:new).returns(lock)
-    assert_raises &quot;Timed out after waiting to build for about 5 hours&quot; do
+    assert_raise_with_message(RuntimeError, &quot;Timed out after waiting to build for about 5 hours&quot;) do
       @serializer.serialize do
         fail &quot;should never run&quot;
       end</diff>
      <filename>test/unit/build_serializer_test.rb</filename>
    </modified>
    <modified>
      <diff>@@ -97,7 +97,7 @@ class BuildStatusTest &lt; Test::Unit::TestCase
   end
 
   def test_elapsed_time_should_raise_an_error_if_elapsed_time_not_availabe
-    assert_raises(&quot;Could not parse elapsed time&quot;) do
+    assert_raise_with_message(RuntimeError, &quot;Could not parse elapsed time&quot;) do
       BuildStatus.new(&quot;artifacts_directory&quot;).elapsed_time
     end
   end
@@ -130,7 +130,7 @@ class BuildStatusTest &lt; Test::Unit::TestCase
   private
 
   def assert_exception_when_parsing_elapsed_time(file_name)
-    assert_raises(&quot;Could not parse elapsed time&quot;) do
+    assert_raise_with_message(RuntimeError, &quot;Could not parse elapsed time&quot;) do
       @status.match_elapsed_time(file_name)
     end  
   end  </diff>
      <filename>test/unit/build_status_test.rb</filename>
    </modified>
    <modified>
      <diff>@@ -12,7 +12,7 @@ class FileLockTest &lt; Test::Unit::TestCase
         
         assert File.file?(file_name)
         assert_equal false, File.open(file_name, 'w') { |f| f.flock(File::LOCK_EX | File::LOCK_NB) }
-        assert_raises(FileLock::AlreadyLockedError, &quot;Already holding a lock on project 'rude'&quot;) do
+        assert_raise(FileLock::AlreadyLockedError, &quot;Already holding a lock on project 'rude'&quot;) do
           lock.lock
         end
 
@@ -27,7 +27,7 @@ class FileLockTest &lt; Test::Unit::TestCase
         begin
           assert_equal 0, lock_file.flock(File::LOCK_EX | File::LOCK_NB)
           
-          assert_raises(FileLock::LockUnavailableError, 
+          assert_raise(FileLock::LockUnavailableError, 
                         &quot;Another process holds a lock on project 'rude'.\n&quot; +
                         &quot;Look for a process with a lock on file ./my.lock&quot;) do
             lock.lock</diff>
      <filename>test/unit/file_lock_test.rb</filename>
    </modified>
    <modified>
      <diff>@@ -76,12 +76,13 @@ class EmailNotifierTest &lt; Test::Unit::TestCase
   def test_useful_errors
     ActionMailer::Base.stubs(:smtp_settings).returns(:foo =&gt; 5)
     CruiseControl::Log.expects(:event).with(&quot;Error sending e-mail - current server settings are :\n  :foo = 5&quot;, :error)
-    BuildMailer.expects(:deliver_build_report).raises('something')
+    BuildMailer.expects(:deliver_build_report).raises('oh noes!')
     
     @notifier.emails = ['foo@crapty.com']
-
-    # FIXME: how does this 'something' match? Something must be wrong with assert_raises 
-    assert_raises('something') { @notifier.build_finished(failing_build) }
+    
+    assert_raise_with_message(RuntimeError, 'oh noes!') do
+      @notifier.build_finished(failing_build)
+    end
   end
 
   def test_configuration_email_from_should_be_used_when_notifier_from_is_not_specified</diff>
      <filename>test/unit/plugins/email_notifier_test.rb</filename>
    </modified>
    <modified>
      <diff>@@ -16,11 +16,11 @@ class PollingSchedulerTest &lt; Test::Unit::TestCase
 
   def test_polling_interval_limits
     assert_nothing_raised { @scheduler.polling_interval = 5.seconds }
-    assert_raises(&quot;Polling interval of 4 seconds is too small (min. 5 seconds)&quot;) do
+    assert_raise_with_message(RuntimeError, &quot;Polling interval of 4 seconds is too small (min. 5 seconds)&quot;) do
       @scheduler.polling_interval = 4.seconds
     end
     assert_nothing_raised { @scheduler.polling_interval = 24.hours }
-    assert_raises(&quot;Polling interval of 86401 seconds is too big (max. 24 hours)&quot;) do
+    assert_raise_with_message(RuntimeError, &quot;Polling interval of 86401 seconds is too big (max. 24 hours)&quot;) do
       @scheduler.polling_interval = 24.hours + 1.second
     end
   end</diff>
      <filename>test/unit/polling_scheduler_test.rb</filename>
    </modified>
    <modified>
      <diff>@@ -139,7 +139,7 @@ class ProjectTest &lt; ActiveSupport::TestCase
       listener = Object.new
       listener.expects(:build_loop_failed).with(error)
       @project.add_plugin listener
-      assert_raises(error) { @project.build_if_necessary }
+      assert_raise(StandardError) { @project.build_if_necessary }
     end
   end
   
@@ -150,7 +150,9 @@ class ProjectTest &lt; ActiveSupport::TestCase
       error = StandardError.new(&quot;something bad happened&quot;)
       @project.expects(:update_project_to_revision).raises(error)
 
-      assert_raises(error) { @project.build(new_revision(5)) }
+      assert_raise_with_message(StandardError, &quot;something bad happened&quot;) do
+        @project.build(new_revision(5))
+      end
       
       build = @project.builds.first
       assert build.failed?
@@ -223,13 +225,17 @@ class ProjectTest &lt; ActiveSupport::TestCase
       
       mock_build = Object.new
       mock_build.stubs(:artifacts_directory).returns(sandbox.root)
+      mock_build.stubs(:label).returns(&quot;1&quot;)
+      mock_build.stubs(:successful?).returns(true)
 
       listener = Object.new
       listener.expects(:build_finished).with(mock_build).raises(StandardError.new(&quot;Listener failed&quot;))
 
       @project.add_plugin listener
 
-      assert_raises('Error in plugin Object: Listener failed') { @project.notify(:build_finished, mock_build) }
+      assert_raise_with_message(RuntimeError, 'Error in plugin Object: Listener failed') do
+        @project.notify(:build_finished, mock_build)
+      end
 
       assert_match /^Listener failed at/, File.read(&quot;#{mock_build.artifacts_directory}/plugin_errors.log&quot;)
     end
@@ -246,8 +252,12 @@ class ProjectTest &lt; ActiveSupport::TestCase
 
       @project.add_plugin listener
 
-      assert_raises('Error in plugin Object: Listener failed') { @project.notify(:sleeping) }
-      assert_raises('Error in plugin Object: Listener failed with :foo') { @project.notify(:doing_something, :foo) }
+      assert_raise_with_message(RuntimeError, 'Error in plugin Object: Listener failed') do
+        @project.notify(:sleeping)
+      end
+      assert_raise_with_message(RuntimeError, 'Error in plugin Object: Listener failed with :foo') do
+        @project.notify(:doing_something, :foo)
+      end
     end
   end
 
@@ -317,13 +327,13 @@ class ProjectTest &lt; ActiveSupport::TestCase
   
   def test_either_rake_task_or_build_command_can_be_set_but_not_both
     @project.rake_task = 'foo'
-    assert_raises(&quot;Cannot set build_command when rake_task is already defined&quot;) do
+    assert_raise_with_message(RuntimeError, &quot;Cannot set build_command when rake_task is already defined&quot;) do
       @project.build_command = 'foo'
     end
 
     @project.rake_task = nil
     @project.build_command = 'foo'
-    assert_raises(&quot;Cannot set rake_task when build_command is already defined&quot;) do
+    assert_raise_with_message(RuntimeError, &quot;Cannot set rake_task when build_command is already defined&quot;) do
       @project.rake_task = 'foo'
     end
   end
@@ -335,7 +345,9 @@ class ProjectTest &lt; ActiveSupport::TestCase
     
     plugin.expects(:hey_you).raises(&quot;Plugin talking&quot;)
     
-    assert_raises(&quot;Error in plugin Object: Plugin talking&quot;) { @project.notify(:hey_you) }
+    assert_raise_with_message(RuntimeError, &quot;Error in plugin Object: Plugin talking&quot;) do
+      @project.notify(:hey_you)
+    end
   end
 
   def test_notify_should_handle_multiple_plugin_errors
@@ -348,7 +360,9 @@ class ProjectTest &lt; ActiveSupport::TestCase
     plugin1.expects(:hey_you).raises(&quot;Plugin 1 talking&quot;)
     plugin2.expects(:hey_you).raises(&quot;Plugin 2 talking&quot;)
 
-    assert_raises(&quot;Errors in plugins:\n  Object: Plugin 1 talking\n  Object: Plugin 2 talking&quot;) { @project.notify(:hey_you) }
+    assert_raise_with_message(RuntimeError, &quot;Errors in plugins:\n  Object: Plugin 1 talking\n  Object: Plugin 2 talking&quot;) do
+      @project.notify(:hey_you)
+    end
   end
 
   def test_request_build_should_start_builder_if_builder_was_down
@@ -670,7 +684,7 @@ class ProjectTest &lt; ActiveSupport::TestCase
   end
   
   def test_adding_a_plugin_should_raise_exception_if_already_configured
-    assert_raises RuntimeError do
+    assert_raise RuntimeError do
       @project.add_plugin BuildReaper.new(@project)
       @project.add_plugin BuildReaper.new(@project)
     end
@@ -678,7 +692,7 @@ class ProjectTest &lt; ActiveSupport::TestCase
   
   def test_notifying_project_of_an_unknown_event_raises_exception
     BuilderPlugin.expects(:known_event?).returns false
-    assert_raises RuntimeError do
+    assert_raise RuntimeError do
       @project.notify :some_random_event
     end
   end
@@ -758,6 +772,7 @@ class ProjectTest &lt; ActiveSupport::TestCase
       build.stubs(:artifacts_directory).returns(&quot;project1/build-#{label}&quot;)
       build.stubs(:last).returns(nil)
       build.stubs(:label).returns(label)
+      build.stubs(:successful?).returns(true)
       build
     end
 end</diff>
      <filename>test/unit/project_test.rb</filename>
    </modified>
    <modified>
      <diff>@@ -42,11 +42,10 @@ class ProjectsMigrationTest &lt; Test::Unit::TestCase
 
     @migration.expects(:migration_scripts).returns(['001_foo.rb', '002_bar.rb', '003_baz.rb'])
 
-    script_error = StandardError.new
     @migration.expects(:execute).with(&quot;ruby #{expected_script_path('002_bar.rb')} #{@sandbox.root}&quot;)
-    @migration.expects(:execute).with(&quot;ruby #{expected_script_path('003_baz.rb')} #{@sandbox.root}&quot;).raises(script_error)
+    @migration.expects(:execute).with(&quot;ruby #{expected_script_path('003_baz.rb')} #{@sandbox.root}&quot;).raises(StandardError.new)
 
-    assert_raises(script_error) { @migration.migrate_data_if_needed }
+    assert_raise(StandardError) { @migration.migrate_data_if_needed }
 
     # migration #3 was broken, current version shall remain at 2
     assert_equal 2, @migration.current_data_version</diff>
      <filename>test/unit/projects_migration_test.rb</filename>
    </modified>
    <modified>
      <diff>@@ -37,7 +37,7 @@ class ProjectsTest &lt; ActiveSupport::TestCase
       projects = Projects.new(sandbox.root)
       @svn.expects(:checkout).raises(&quot;svn error&quot;)
 
-      assert_raises('svn error') do
+      assert_raise_with_message(RuntimeError, 'svn error') do
         projects &lt;&lt; @one
       end
 
@@ -50,7 +50,7 @@ class ProjectsTest &lt; ActiveSupport::TestCase
     in_sandbox do |sandbox|
       projects = Projects.new(sandbox.root)
       projects &lt;&lt; @one      
-      assert_raises(&quot;Project named \&quot;one\&quot; already exists in #{sandbox.root}&quot;) do
+      assert_raise_with_message(RuntimeError, &quot;Project named \&quot;one\&quot; already exists in #{sandbox.root}&quot;) do
         projects &lt;&lt; @one        
       end
       assert File.directory?(@one.path), &quot;Project directory does not exist.&quot;</diff>
      <filename>test/unit/projects_test.rb</filename>
    </modified>
    <modified>
      <diff>@@ -2,24 +2,16 @@ require File.dirname(__FILE__) + '/../test_helper'
 
 class RoutingTest &lt; ActionController::TestCase
   def test_build
-    if RUBY_VERSION == '1.8.7'
-      puts '!!!!!! Skipping test on Ruby 1.8.7, re-enable after Rails upgrade.  See https://rails.lighthouseapp.com/projects/8994/tickets/867-undefined-method-length-for-enumerable'
-    else
-      assert_routing 'builds/CruiseControl', {:controller =&gt; 'builds', :action =&gt; 'show', :project =&gt; 'CruiseControl'}
-      assert_routing 'builds/CruiseControl/1', 
-                      {:controller =&gt; 'builds', :action =&gt; 'show', :project =&gt; 'CruiseControl', :build =&gt; '1'}
-      assert_routing 'builds/CruiseControl/1.2', 
-                      {:controller =&gt; 'builds', :action =&gt; 'show', :project =&gt; 'CruiseControl', :build =&gt; '1.2'}
-    end
+    assert_routing 'builds/CruiseControl', {:controller =&gt; 'builds', :action =&gt; 'show', :project =&gt; 'CruiseControl'}
+    assert_routing 'builds/CruiseControl/1', 
+                    {:controller =&gt; 'builds', :action =&gt; 'show', :project =&gt; 'CruiseControl', :build =&gt; '1'}
+    assert_routing 'builds/CruiseControl/1.2', 
+                    {:controller =&gt; 'builds', :action =&gt; 'show', :project =&gt; 'CruiseControl', :build =&gt; '1.2'}
   end
 
   def test_build_artifacts
-    if RUBY_VERSION == '1.8.7'
-      puts '!!!!!! Skipping test on Ruby 1.8.7, re-enable after Rails upgrade.  See https://rails.lighthouseapp.com/projects/8994/tickets/867-undefined-method-length-for-enumerable'
-    else
-      assert_routing 'builds/CruiseControl/1.2/this/stuff.rb', 
-                      {:controller =&gt; 'builds', :action =&gt; 'artifact', :project =&gt; 'CruiseControl', :build =&gt; '1.2', 
-                       :path =&gt; ['this', 'stuff.rb']}
-    end
+    assert_routing 'builds/CruiseControl/1.2/this/stuff.rb', 
+                    {:controller =&gt; 'builds', :action =&gt; 'artifact', :project =&gt; 'CruiseControl', :build =&gt; '1.2', 
+                     :path =&gt; ['this', 'stuff.rb']}
   end
 end</diff>
      <filename>test/unit/routing_test.rb</filename>
    </modified>
    <modified>
      <diff>@@ -17,7 +17,7 @@ class SourceControl::AbstractAdapterTest &lt; Test::Unit::TestCase
   def test_execute_with_error_log__shows_all_lines_of_multiline_exceptions
     @adapter = SourceControl::AbstractAdapter.new
     in_total_sandbox do
-      assert_raises(BuilderError, /svn:.*svn:/m) do
+      assert_raise(BuilderError, /svn:.*svn:/m) do
               @adapter.execute_with_error_log(&quot;svn co file://foo/bar&quot;, @stderr)
             end
     end</diff>
      <filename>test/unit/source_control/abstract_adapter_test.rb</filename>
    </modified>
    <modified>
      <diff>@@ -35,7 +35,7 @@ class SourceControl::GitTest &lt; Test::Unit::TestCase
     end
   end
 
-  def test_up_to_date?_should_return_false_if_there_are_new_revisions
+  def test_up_to_date_should_return_false_if_there_are_new_revisions
     in_sandbox do
       git = new_git
       mock_revisions(git, [:new_revision])
@@ -46,7 +46,7 @@ class SourceControl::GitTest &lt; Test::Unit::TestCase
     end
   end
 
-  def test_up_to_date?_should_return_true_if_there_are_no_new_revisions
+  def test_up_to_date_should_return_true_if_there_are_no_new_revisions
     in_sandbox do
       git = new_git
       mock_revisions(git, [])
@@ -92,7 +92,7 @@ class SourceControl::GitTest &lt; Test::Unit::TestCase
       git = Git.new(:repository =&gt; nil)
       git.expects(:git).never
 
-      assert_raises(RuntimeError) { git.checkout }
+      assert_raise(RuntimeError) { git.checkout }
     end
   end
 </diff>
      <filename>test/unit/source_control/git_test.rb</filename>
    </modified>
    <modified>
      <diff>@@ -73,7 +73,7 @@ EOF
       actual = parse_log(SIMPLE_LOG_ENTRY)
 
       assert_equal expected_result, actual
-      assert_equal &quot;Revision 359 committed by aslak on 2006-05-22 13:23:29\nversioning\n  A /trunk/foo.txt\n&quot;, actual.to_s #this is fixing a bug
+      assert_equal &quot;Revision 359 committed by aslak on 2006-05-22 13:23:29\nversioning\n  A /trunk/foo.txt\n&quot;, actual.join
     end
 
     def test_can_parse_LOG_WITH_NO_MESSAGE
@@ -81,7 +81,7 @@ EOF
       actual = parse_log(LOG_WITH_NO_MESSAGE)
 
       assert_equal expected, actual
-      assert_equal &quot;Revision 1 committed by  on \n\n\n&quot;, actual.to_s #this is fixing a bug
+      assert_equal &quot;Revision 1 committed by  on \n\n\n&quot;, actual.join
     end
 
     def test_can_parse_LOG_ENTRY_WITH_ANONYMOUS_AUTHOR</diff>
      <filename>test/unit/source_control/subversion/log_parser_test.rb</filename>
    </modified>
    <modified>
      <diff>@@ -56,7 +56,7 @@ class SourceControl::SubversionTest &lt; Test::Unit::TestCase
   end
 
   def test_only_except_known_options
-    assert_raises(&quot;don't know how to handle 'sugar'&quot;) do
+    assert_raise_with_message(RuntimeError, &quot;don't know how to handle 'sugar'&quot;) do
       Subversion.new(:sugar =&gt; &quot;1/2 cup&quot;)
     end
   end
@@ -65,7 +65,7 @@ class SourceControl::SubversionTest &lt; Test::Unit::TestCase
     revision_number = 10
 
     svn = new_subversion
-    svn.expects(:svn).with(&quot;update&quot;, [&quot;--revision&quot;, revision_number]).returns(&quot;your mom&quot;)
+    svn.expects(:svn).with(&quot;update&quot;, [&quot;--revision&quot;, revision_number]).returns([&quot;your mom&quot;])
 
     svn.update(Subversion::Revision.new(revision_number))
   end
@@ -145,11 +145,11 @@ class SourceControl::SubversionTest &lt; Test::Unit::TestCase
   end
 
   def test_checkout_requires_repository_location
-    assert_raises('Repository location is not specified') { Subversion.new.checkout('.') }
+    assert_raise_with_message(RuntimeError, 'Repository location is not specified') { Subversion.new.checkout('.') }
   end
 
   def test_new_does_not_allow_random_params
-    assert_raises(&quot;don't know how to handle 'lollipop'&quot;) do
+    assert_raise_with_message(RuntimeError, &quot;don't know how to handle 'lollipop'&quot;) do
       Subversion.new(:repository =&gt; 'http://foo.com/svn/project', :lollipop =&gt; 'http://foo.com/svn/project')
     end
   end</diff>
      <filename>test/unit/source_control/subversion_test.rb</filename>
    </modified>
    <modified>
      <diff>@@ -5,7 +5,7 @@ class SourceControlTest &lt; Test::Unit::TestCase
 
   def test_create_should_require_presence_of_url_in_options
     in_sandbox do
-      assert_raises(ArgumentError, &quot;options should include repository&quot;) do
+      assert_raise(ArgumentError, &quot;options should include repository&quot;) do
         scm = SourceControl.create({:repository =&gt; nil})
       end
     end
@@ -76,7 +76,7 @@ class SourceControlTest &lt; Test::Unit::TestCase
 
   def test_create_should_blow_up_if_given_a_non_recognized_source_control_string
     in_sandbox do
-      assert_raises RuntimeError do
+      assert_raise RuntimeError do
         SourceControl.create(:repository =&gt; &quot;http://my_repo&quot;, :source_control =&gt; 'not_a_scm')
       end
     end
@@ -84,7 +84,7 @@ class SourceControlTest &lt; Test::Unit::TestCase
 
   def test_create_should_blow_up_if_given_class_that_can_be_constantized_but_is_not_a_scm_adapter
     in_sandbox do
-      assert_raises RuntimeError do
+      assert_raise RuntimeError do
         SourceControl.create(:repository =&gt; &quot;http://my_repo&quot;, :source_control =&gt; &quot;String&quot;)
       end
     end
@@ -153,7 +153,7 @@ class SourceControlTest &lt; Test::Unit::TestCase
       File.expects(:directory?).with(File.join('./Proj1/work', '.hg')).returns(false)
       File.expects(:directory?).with(File.join('./Proj1/work', '.bzr')).returns(false)
 
-      assert_raises RuntimeError, &quot;Could not detect the type of source control in ./Proj1/work&quot; do
+      assert_raise RuntimeError, &quot;Could not detect the type of source control in ./Proj1/work&quot; do
         SourceControl.detect('./Proj1/work')
       end
     end
@@ -166,7 +166,7 @@ class SourceControlTest &lt; Test::Unit::TestCase
       File.expects(:directory?).with(File.join('./Proj1/work', '.hg')).returns(false)
       File.expects(:directory?).with(File.join('./Proj1/work', '.bzr')).returns(false)
 
-      assert_raises RuntimeError, &quot;More than one type of source control was detected in ./Proj1/work&quot; do
+      assert_raise RuntimeError, &quot;More than one type of source control was detected in ./Proj1/work&quot; do
         SourceControl.detect('./Proj1/work')
       end
     end</diff>
      <filename>test/unit/source_control_test.rb</filename>
    </modified>
    <modified>
      <diff>@@ -63,10 +63,10 @@ if ARGV.grep(/--run-rake-task=/).empty?
           reg_exp = []
           for show_type in show_only
             reg_exp &lt;&lt; case show_type
-              when 'm', 'models' : 'app\/models'
-              when 'c', 'controllers' : 'app\/controllers'
-              when 'h', 'helpers' : 'app\/helpers'
-              when 'l', 'lib' : 'lib'
+              when 'm', 'models' then 'app\/models'
+              when 'c', 'controllers' then 'app\/controllers'
+              when 'h', 'helpers' then 'app\/helpers'
+              when 'l', 'lib' then 'lib'
               else
                 show_type
             end</diff>
      <filename>vendor/plugins/rails_rcov/tasks/rails_rcov.rake</filename>
    </modified>
  </modified>
  <removed type="array">
    <removed>
      <filename>config/initializers/fix_for_ruby_187.rb</filename>
    </removed>
  </removed>
  <parents type="array">
    <parent>
      <id>562dcfc4195cb601ee49f39269d7a0f72959102b</id>
    </parent>
  </parents>
  <author>
    <name>Matt Duncan</name>
    <email>mrduncan@gmail.com</email>
  </author>
  <url>http://github.com/thoughtworks/cruisecontrol.rb/commit/8f7f933fcaaa3b517722aaa41f9c37f54fc6d7e4</url>
  <id>8f7f933fcaaa3b517722aaa41f9c37f54fc6d7e4</id>
  <committed-date>2009-09-08T15:18:41-07:00</committed-date>
  <authored-date>2009-09-06T09:06:46-07:00</authored-date>
  <message>Improving ruby 1.9 compatibility - functional and unit tests passing on
ruby 1.9.1</message>
  <tree>9305cb89299616e48d361ce7adbea46e567ca610</tree>
  <committer>
    <name>Matt Duncan</name>
    <email>mrduncan@gmail.com</email>
  </committer>
</commit>
