Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge remote-tracking branch 'origin/master'
* origin/master:
  Switched to a relative load of rake/phony for ruby integration
  • Loading branch information
jimweirich committed Nov 15, 2012
2 parents b6e1c58 + 2312af6 commit 04f4b85
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions test/test_rake_file_task.rb
@@ -1,10 +1,6 @@
require File.expand_path('../helper', __FILE__)
require 'fileutils'

def load_phony
load File.dirname(__FILE__) + "/../lib/rake/phony.rb"
end

class TestRakeFileTask < Rake::TestCase
include Rake

Expand Down Expand Up @@ -119,4 +115,8 @@ def ztest_file_deletes_on_failure
assert( ! File.exist?(NEWFILE), "NEWFILE should be deleted")
end

def load_phony
load File.join(@orig_PWD, "lib/rake/phony.rb")
end

end

0 comments on commit 04f4b85

Please sign in to comment.