Merge pull request #205 from fcheung/make_tests_green_on_20

Make tests green on 20

Author: eric

.travis.yml

@@ -3,4 +3,6 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
+  - 2.0.0
+  - 2.1.5
   - ree

god.gemspec

@@ -25,15 +25,18 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency('json', '~> 1.6')
   s.add_development_dependency('rake')
+  s.add_development_dependency('minitest')
   s.add_development_dependency('rdoc', '~> 3.10')
   s.add_development_dependency('twitter', '~> 4.0')
   s.add_development_dependency('prowly', '~> 0.3')
   s.add_development_dependency('xmpp4r', '~> 0.5')
   s.add_development_dependency('dike', '~> 0.0.3')
-  s.add_development_dependency('rcov', '~> 0.9')
+ # s.add_development_dependency('rcov', '~> 0.9')
   s.add_development_dependency('daemons', '~> 1.1')
   s.add_development_dependency('mocha', '~> 0.10')
   s.add_development_dependency('gollum', '~> 1.3.1')
+  #the last version to support 1.8.7 is 0.99.6
+  s.add_development_dependency('mustache', ['~> 0.99.0', '< 0.99.7'])
   s.add_development_dependency('airbrake', '~> 3.1.7')
   s.add_development_dependency('nokogiri', '~> 1.5.0')
   s.add_development_dependency('activesupport', [ '>= 2.3.10', '< 4.0.0' ])

lib/god/process.rb

@@ -43,7 +43,7 @@ def file_writable?(file)
           exit(1)
         end
 
-        File.writable?(file_in_chroot(file)) ? exit(0) : exit(1)
+        File.writable?(file_in_chroot(file)) ? exit!(0) : exit!(1)
       end
 
       wpid, status = ::Process.waitpid2(pid)

test/helper.rb

@@ -7,7 +7,8 @@
 require File.join(File.dirname(__FILE__), *%w[.. lib god])
 God::EventHandler.load
 
-require 'test/unit'
+require 'minitest/autorun'
+require 'minitest/unit'
 require 'set'
 
 include God
@@ -115,12 +116,16 @@ def output_logs
 #   end
 # end
 
-module Test::Unit::Assertions
+module Minitest::Assertions
   def assert_abort
-    assert_raise SystemExit do
+    assert_raises SystemExit do
       yield
     end
   end
+
+  def assert_nothing_raised
+    yield
+  end
 end
 
 # This allows you to be a good OOP citizen and honor encapsulation, but

test/test_airbrake.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/helper'
 
-class TestAirbrake < Test::Unit::TestCase
+class TestAirbrake < Minitest::Test
   def test_notify
     airbrake = God::Contacts::Airbrake.new
     airbrake.apikey = "put_your_apikey_here"

test/test_behavior.rb

@@ -1,12 +1,12 @@
 require File.dirname(__FILE__) + '/helper'
 
-class TestBehavior < Test::Unit::TestCase
+class TestBehavior < Minitest::Test
   def test_generate_should_return_an_object_corresponding_to_the_given_type
     assert_equal Behaviors::FakeBehavior, Behavior.generate(:fake_behavior, nil).class
   end
 
   def test_generate_should_raise_on_invalid_type
-    assert_raise NoSuchBehaviorError do
+    assert_raises NoSuchBehaviorError do
       Behavior.generate(:foo, nil)
     end
   end

test/test_campfire.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/helper'
 
-class TestCampfire < Test::Unit::TestCase
+class TestCampfire < Minitest::Test
   def setup
     @campfire = God::Contacts::Campfire.new
   end

test/test_condition.rb

@@ -3,7 +3,7 @@
 class BadlyImplementedCondition < PollCondition
 end
 
-class TestCondition < Test::Unit::TestCase
+class TestCondition < Minitest::Test
 
   # generate
 
@@ -12,7 +12,7 @@ def test_generate_should_return_an_object_corresponding_to_the_given_type
   end
 
   def test_generate_should_raise_on_invalid_type
-    assert_raise NoSuchConditionError do
+    assert_raises NoSuchConditionError do
       Condition.generate(:foo, nil)
     end
   end
@@ -45,7 +45,7 @@ def test_generate_should_return_a_good_error_message_for_invalid_types
   def test_test_should_raise_if_not_defined_in_subclass
     c = BadlyImplementedCondition.new
 
-    assert_raise AbstractMethodNotOverriddenError do
+    assert_raises AbstractMethodNotOverriddenError do
       c.test
     end
   end

test/test_conditions_disk_usage.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/helper'
 
-class TestConditionsDiskUsage < Test::Unit::TestCase
+class TestConditionsDiskUsage < Minitest::Test
   # valid?
 
   def test_valid_should_return_false_if_no_above_given

test/test_conditions_http_response_code.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/helper'
 
-class TestHttpResponseCode < Test::Unit::TestCase
+class TestHttpResponseCode < Minitest::Test
   def valid_condition
     c = Conditions::HttpResponseCode.new()
     c.watch = stub(:name => 'foo')