Fix warnings with newer minitest versions.

diff --git a/test/mailshears_test.rb b/test/mailshears_test.rb
index e46ca11ff4d144c8324030ec170efffe5d87ae17..865bd4a18eefd72b071a45968a4ac90d10fc4ae8 100644 (file)
--- a/test/mailshears_test.rb
+++ b/test/mailshears_test.rb
@@ -1,9 +1,9 @@
 require 'common/configuration'
 require 'fileutils'
 require 'common/configuration'
 require 'fileutils'

-require 'minitest/unit'
+require 'minitest/autorun'

 require 'pg'
 
 require 'pg'
 

-class MailshearsTest < MiniTest::Unit::TestCase
+class MailshearsTest < MiniTest::Test

   # This is that class that most (if not all) of our test cases will
   # inherit. It provides the automatic setup and teardown of the
   # filesystem and database that the test cases will exercise.
   # This is that class that most (if not all) of our test cases will
   # inherit. It provides the automatic setup and teardown of the
   # filesystem and database that the test cases will exercise.

diff --git a/test/test_mv.rb b/test/test_mv.rb
index 7ded82016072a526874f0c68bc172738c69d3b71..968782b5548e92c110c1d6063cf9cb64ea3a79a9 100644 (file)
--- a/test/test_mv.rb
+++ b/test/test_mv.rb
@@ -3,7 +3,6 @@
 require 'common/domain'
 require 'common/user'
 require 'mailshears_test'
 require 'common/domain'
 require 'common/user'
 require 'mailshears_test'

-require 'minitest/autorun'

 require 'mv/plugins/agendav'
 require 'mv/plugins/davical'
 require 'mv/plugins/dovecot'
 require 'mv/plugins/agendav'
 require 'mv/plugins/davical'
 require 'mv/plugins/dovecot'

diff --git a/test/test_prune.rb b/test/test_prune.rb
index 35c1a5c6941d391c008807df8d79fc392ff76183..059de528359c1386dfa62c095bfd16e3473f39c7 100644 (file)
--- a/test/test_prune.rb
+++ b/test/test_prune.rb
@@ -3,7 +3,6 @@
 require 'common/domain'
 require 'common/user'
 require 'mailshears_test'
 require 'common/domain'
 require 'common/user'
 require 'mailshears_test'

-require 'minitest/autorun'

 require 'prune/plugins/agendav'
 require 'prune/plugins/davical'
 require 'prune/plugins/dovecot'
 require 'prune/plugins/agendav'
 require 'prune/plugins/davical'
 require 'prune/plugins/dovecot'

diff --git a/test/test_rm.rb b/test/test_rm.rb
index 210ca5daa8cfb2485a1bed7a9ec8d00d415d12f0..24dacc3391f309ebdce6dfa63b710d109702dd5e 100644 (file)
--- a/test/test_rm.rb
+++ b/test/test_rm.rb
@@ -3,7 +3,6 @@
 require 'common/domain'
 require 'common/user'
 require 'mailshears_test'
 require 'common/domain'
 require 'common/user'
 require 'mailshears_test'

-require 'minitest/autorun'

 require 'rm/plugins/agendav'
 require 'rm/plugins/davical'
 require 'rm/plugins/dovecot'
 require 'rm/plugins/agendav'
 require 'rm/plugins/davical'
 require 'rm/plugins/dovecot'