m 1.3.3 → 1.3.4

data/test/empty_test.rb

@@ -4,6 +4,6 @@ class EmptyTest < MTest
   def test_run_simple_test_by_line_number
     output = m('examples/empty_example_test.rb')
     assert !$?.success?
-    assert_match /There were no tests found./, output
+    assert_match(/There were no tests found./, output)
   end
 end

data/test/everything_test.rb

@@ -3,26 +3,31 @@ require 'test_helper'
 class EverythingTest < MTest
   def test_runs_entire_test_suite_with_no_arguments
     output = m('')
-    assert_output /14 tests/, output
+    assert_output(/12 tests/, output)
   end
 
   def test_missing_file_gives_a_decent_error_message
     output = m('examples/thisdoesnexist_test.rb')
     assert !$?.success?
-    assert_match /Failed loading test file/, output
-    assert_match /cannot load such file/, output
+    assert_match(/Failed loading test file/, output)
+    assert_match(/cannot load such file/, output)
   end
 
   def test_running_tests_within_a_subdirectory
     output = m('examples/subdir')
-    assert_output /3 tests/, output
+    assert_output(/3 tests/, output)
 
     output = m('examples')
-    assert_output /14 tests/, output
+    assert_output(/12 tests/, output)
+  end
+
+  def test_running_tests_with_failures_within_a_subdirectory
+    output = m('examples/subdir_with_failures')
+    assert_output(/1 tests, 1 assertions, 1 failures/, output)
   end
 
   def test_blank_file_is_quieter
     output = m('bananas')
-    assert_no_match /Valid tests to run/, output
+    assert(/Valid tests to run/ !~ output)
   end
 end

data/test/examples/active_support_example_test.rb

@@ -1,4 +1,3 @@
-require 'test/unit'
 require 'active_support/test_case'
 
 class ActiveSupportExampleTest < ActiveSupport::TestCase

data/test/examples/active_support_unescaped_example_test.rb

@@ -1,4 +1,3 @@
-require 'test/unit'
 require 'active_support/test_case'
 
 class ActiveSupportExampleTest < ActiveSupport::TestCase

data/test/examples/empty_example_test.rb

@@ -1,4 +1,4 @@
-require 'test/unit'
+require_relative '../test_helper'
 
-class EmptyExampleTest < Test::Unit::TestCase
+class EmptyExampleTest < MTest
 end

data/test/examples/minitest_4_example_test.rb

@@ -1,6 +1,6 @@
 require 'minitest/unit'
-if M::Frameworks.minitest4?
 
+if M::Frameworks.minitest4?
   class Meme
     def i_can_has_cheezburger?
       "OHAI!"
@@ -11,7 +11,6 @@ if M::Frameworks.minitest4?
     end
   end
 
-
   class TestMeme < MiniTest::Unit::TestCase
     def setup
       @meme = Meme.new
@@ -22,15 +21,14 @@ if M::Frameworks.minitest4?
     end
 
     def test_that_it_will_not_blend
-      refute_match /^maybe/i, @meme.will_it_blend?
-      refute_match /^no/i, @meme.will_it_blend?
-      refute_match /^lolz/i, @meme.will_it_blend?
+      refute_match(/^maybe/i, @meme.will_it_blend?)
+      refute_match(/^no/i, @meme.will_it_blend?)
+      refute_match(/^lolz/i, @meme.will_it_blend?)
     end
 
     def test_that_kitty_can_eat_two_time
       assert_equal "OHAI!", @meme.i_can_has_cheezburger?
       assert_equal "OHAI!", @meme.i_can_has_cheezburger?
     end
-
   end
 end

data/test/examples/minitest_5_example_test.rb

@@ -1,4 +1,5 @@
 require 'minitest/autorun'
+
 if M::Frameworks.minitest5?
   class Meme
     def i_can_has_cheezburger?
@@ -10,7 +11,6 @@ if M::Frameworks.minitest5?
     end
   end
 
-
   class TestMeme < Minitest::Test
     def setup
       @meme = Meme.new
@@ -21,15 +21,14 @@ if M::Frameworks.minitest5?
     end
 
     def test_that_it_will_not_blend
-      refute_match /^maybe/i, @meme.will_it_blend?
-      refute_match /^no/i, @meme.will_it_blend?
-      refute_match /^lolz/i, @meme.will_it_blend?
+      refute_match(/^maybe/i, @meme.will_it_blend?)
+      refute_match(/^no/i, @meme.will_it_blend?)
+      refute_match(/^lolz/i, @meme.will_it_blend?)
     end
 
     def test_that_kitty_can_eat_two_time
       assert_equal "OHAI!", @meme.i_can_has_cheezburger?
       assert_equal "OHAI!", @meme.i_can_has_cheezburger?
     end
-
   end
 end

data/test/examples/multiple_example_test.rb

@@ -1,4 +1,3 @@
-require 'test/unit'
 require 'active_support/test_case'
 
 class MultipleExampleTest < ActiveSupport::TestCase

data/test/examples/subdir/a_test.rb

@@ -1,6 +1,6 @@
-require 'test/unit'
+require_relative '../../test_helper'
 
-class ATest < Test::Unit::TestCase
+class ATest < MTest
   def test_a
     assert_equal 1, 1
   end

data/test/examples/subdir/b_test.rb

@@ -1,6 +1,6 @@
-require 'test/unit'
+require_relative '../../test_helper'
 
-class BTest < Test::Unit::TestCase
+class BTest < MTest
   def test_b
     assert_equal 1, 1
   end

data/test/examples/subdir/c_test.rb

@@ -1,6 +1,6 @@
-require 'test/unit'
+require_relative '../../test_helper'
 
-class CTest < Test::Unit::TestCase
+class CTest < MTest
   def test_c
     assert_equal 1, 1
   end

data/test/examples/subdir_with_failures/a_test.rb

@@ -0,0 +1,7 @@
+require_relative '../../test_helper'
+
+class ATest < MTest
+  def test_a
+    assert_equal 1, 2
+  end
+end

data/test/examples/test_unit_example_test.rb

@@ -1,16 +1,16 @@
-require 'test/unit'
+if M::Frameworks.test_unit?
+  class TestUnitExampleTest < Test::Unit::TestCase
+    def setup
+    end
 
-class TestUnitExampleTest < Test::Unit::TestCase
-  def setup
-  end
-
-  def test_apple
-    assert_equal 1, 1
-  end
+    def test_apple
+      assert_equal 1, 1
+    end
 
-  def test_banana
-    assert_equal 1, 1
-    assert_equal 2, 2
-    assert_equal 3, 3
+    def test_banana
+      assert_equal 1, 1
+      assert_equal 2, 2
+      assert_equal 3, 3
+    end
   end
 end

data/test/minitest_4_test.rb

@@ -1,39 +1,39 @@
 require 'test_helper'
-if M::Frameworks.minitest4?
 
+if M::Frameworks.minitest4?
   class Minitest4Test < MTest
     def test_run_simple_test_by_line_number
-      output = m('examples/minitest_4_example_test.rb:20')
-      assert_output /1 tests, 1 assertions/, output
+      output = m('examples/minitest_4_example_test.rb:19')
+      assert_output(/1 tests, 1 assertions/, output)
     end
 
     def test_runs_entire_test_without_line_number
       output = m('examples/minitest_4_example_test.rb')
-      assert_output /3 tests/, output
+      assert_output(/3 tests/, output)
     end
 
     def test_run_inside_of_test
-      output = m('examples/minitest_4_example_test.rb:21')
-      assert_output /1 tests, 1 assertions/, output
+      output = m('examples/minitest_4_example_test.rb:20')
+      assert_output(/1 tests, 1 assertions/, output)
     end
 
     def test_run_on_end_of_test
-      output = m('examples/minitest_4_example_test.rb:22')
-      assert_output /1 tests, 1 assertions/, output
+      output = m('examples/minitest_4_example_test.rb:21')
+      assert_output(/1 tests, 1 assertions/, output)
     end
 
     def test_run_inside_big_test
       output = m('examples/minitest_4_example_test.rb:26')
-      assert_output /1 tests, 6 assertions/, output
+      assert_output(/1 tests, 6 assertions/, output)
     end
 
     def test_run_on_blank_line
-      output = m('examples/minitest_4_example_test.rb:3')
+      output = m('examples/minitest_4_example_test.rb:2')
 
       assert !$?.success?
-      assert_match /No tests found on line 3. Valid tests to run:/, output
-      assert_match %r{    test_that_kitty_can_eat: m examples/minitest_4_example_test\.rb:20}, output
-      assert_match %r{test_that_it_will_not_blend: m examples/minitest_4_example_test\.rb:24}, output
+      assert_match(/No tests found on line 2. Valid tests to run:/, output)
+      assert_match %r{    test_that_kitty_can_eat: m examples/minitest_4_example_test\.rb:19}, output
+      assert_match %r{test_that_it_will_not_blend: m examples/minitest_4_example_test\.rb:23}, output
     end
   end
 end

data/test/minitest_5_test.rb

@@ -3,34 +3,34 @@ if M::Frameworks.minitest5?
   class Minitest5Test < MTest
     def test_run_simple_test_by_line_number
       output = m('examples/minitest_5_example_test.rb:19')
-      assert_output /1 runs, 1 assertions/, output
+      assert_output(/1 runs, 1 assertions/, output)
     end
 
     def test_runs_entire_test_without_line_number
       output = m('examples/minitest_5_example_test.rb')
-      assert_output /3 runs/, output
+      assert_output(/3 runs/, output)
     end
 
     def test_run_inside_of_test
       output = m('examples/minitest_5_example_test.rb:20')
-      assert_output /1 runs, 1 assertions/, output
+      assert_output(/1 runs, 1 assertions/, output)
     end
 
     def test_run_on_end_of_test
       output = m('examples/minitest_5_example_test.rb:21')
-      assert_output /1 runs, 1 assertions/, output
+      assert_output(/1 runs, 1 assertions/, output)
     end
 
     def test_run_inside_big_test
       output = m('examples/minitest_5_example_test.rb:26')
-      assert_output /1 runs, 6 assertions/, output
+      assert_output(/1 runs, 6 assertions/, output)
     end
 
     def test_run_on_blank_line
       output = m('examples/minitest_5_example_test.rb:3')
 
       assert !$?.success?
-      assert_match /No tests found on line 3. Valid tests to run:/, output
+      assert_match(/No tests found on line 3. Valid tests to run:/, output)
       assert_match %r{    test_that_kitty_can_eat: m examples/minitest_5_example_test\.rb:19}, output
       assert_match %r{test_that_it_will_not_blend: m examples/minitest_5_example_test\.rb:23}, output
     end

data/test/multiple_test.rb

@@ -3,16 +3,16 @@ require 'test_helper'
 class MultipleTest < MTest
   def test_run_simple_test_by_line_number
     output = m('examples/multiple_example_test.rb:11')
-    assert_output /1 tests, 1 assertions/, output
+    assert_output(/1 tests, 1 assertions/, output)
   end
 
   def test_runs_entire_test_without_line_number
     output = m('examples/multiple_example_test.rb')
-    assert_output /4 tests/, output
+    assert_output(/4 tests/, output)
   end
 
   def test_runs_all_tests_on_given_line_number
     output = m('examples/multiple_example_test.rb:6')
-    assert_output /3 tests/, output
+    assert_output(/3 tests/, output)
   end
 end

data/test/options_test.rb

@@ -3,31 +3,31 @@ require 'test_helper'
 class OptionsTest < MTest
   def test_short_help_option
     output = m('-h')
-    assert_output /^Usage: m \[OPTIONS\] \[FILES\]/, output
+    assert_output(/^Usage: m \[OPTIONS\] \[FILES\]/, output)
   end
 
   def test_long_help_option
     output = m('--help')
-    assert_output /^Usage: m \[OPTIONS\] \[FILES\]/, output
+    assert_output(/^Usage: m \[OPTIONS\] \[FILES\]/, output)
   end
 
   def test_verbose_option
     output = m('--version')
-    assert_output /^m #{M::VERSION}/, output
+    assert_output(/^m #{M::VERSION}/, output)
   end
 
   def test_short_line_option
     output = m('-l20 examples/minitest_4_example_test.rb')
-    assert_output /1 tests, 1 assertions/, output
+    assert_output(/1 tests, 1 assertions/, output)
   end
 
   def test_long_line_option
     output = m('--line 20 examples/minitest_4_example_test.rb')
-    assert_output /1 tests, 1 assertions/, output
+    assert_output(/1 tests, 1 assertions/, output)
   end
 
   def test_line_option_has_precedence_over_colon_format
     output = m('--line 20 examples/minitest_4_example_test.rb:2')
-    assert_output /1 tests, 1 assertions/, output
+    assert_output(/1 tests, 1 assertions/, output)
   end
 end

data/test/test_helper.rb

@@ -1,13 +1,10 @@
-if ENV['TRAVIS']
-  require 'coveralls'
-
-  Coveralls.wear!
-end
+require 'coveralls'
+Coveralls.wear_merged!
 
 module Testable
   def m(arguments)
     Dir.chdir("test") do
-      `ruby -I../lib -I. ../bin/m #{arguments} 2>&1`.strip
+      `ruby -I../lib  -I. ../bin/m #{arguments} 2>&1`.strip
     end
   end
 
@@ -17,17 +14,21 @@ module Testable
   end
 end
 
-require './lib/m'
+require 'm'
 require 'minitest/autorun'
-if M::Frameworks.minitest5?
-  class MTest < Minitest::Test
-    include ::Testable
-  end
-else
+if M::Frameworks.test_unit?
   require 'test/unit'
   require 'active_support/test_case'
 
   class MTest < Test::Unit::TestCase
     include ::Testable
   end
+elsif M::Frameworks.minitest5?
+  class MTest < Minitest::Test
+    include ::Testable
+  end
+else
+  class MTest < MiniTest::Unit::TestCase
+    include ::Testable
+  end
 end

data/test/test_unit_test.rb

@@ -1,37 +1,39 @@
 require 'test_helper'
 
-class TestUnitTest < MTest
-  def test_run_simple_test_by_line_number
-    output = m('examples/test_unit_example_test.rb:7')
-    assert_output /1 tests, 1 assertions/, output
-  end
+if M::Frameworks.test_unit?
+  class TestUnitTest < MTest
+    def test_run_simple_test_by_line_number
+      output = m('examples/test_unit_example_test.rb:7')
+      assert_output(/1 tests, 1 assertions/, output)
+    end
 
-  def test_runs_entire_test_without_line_number
-    output = m('examples/test_unit_example_test.rb')
-    assert_output /2 tests/, output
-  end
+    def test_runs_entire_test_without_line_number
+      output = m('examples/test_unit_example_test.rb')
+      assert_output(/2 tests/, output)
+    end
 
-  def test_run_inside_of_test
-    output = m('examples/test_unit_example_test.rb:8')
-    assert_output /1 tests, 1 assertions/, output
-  end
+    def test_run_inside_of_test
+      output = m('examples/test_unit_example_test.rb:8')
+      assert_output(/1 tests, 1 assertions/, output)
+    end
 
-  def test_run_on_end_of_test
-    output = m('examples/test_unit_example_test.rb:9')
-    assert_output /1 tests, 1 assertions/, output
-  end
+    def test_run_on_end_of_test
+      output = m('examples/test_unit_example_test.rb:9')
+      assert_output(/1 tests, 1 assertions/, output)
+    end
 
-  def test_run_inside_big_test
-    output = m('examples/test_unit_example_test.rb:14')
-    assert_output /1 tests, 3 assertions/, output
-  end
+    def test_run_inside_big_test
+      output = m('examples/test_unit_example_test.rb:14')
+      assert_output(/1 tests, 3 assertions/, output)
+    end
 
-  def test_run_on_blank_line
-    output = m('examples/test_unit_example_test.rb:2')
+    def test_run_on_blank_line
+      output = m('examples/test_unit_example_test.rb:2')
 
-    assert !$?.success?
-    assert_match /No tests found on line 2. Valid tests to run:/, output
-    assert_match %r{ test_apple: m examples/test_unit_example_test\.rb:7}, output
-    assert_match %r{test_banana: m examples/test_unit_example_test\.rb:11}, output
+      assert !$?.success?
+      assert_match(/No tests found on line 2. Valid tests to run:/, output)
+      assert_match(%r{ test_apple: m examples/test_unit_example_test\.rb:7}, output)
+      assert_match(%r{test_banana: m examples/test_unit_example_test\.rb:11}, output)
+    end
   end
 end