summaryrefslogtreecommitdiffstats
path: root/lib/mini
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-09-28 09:39:53 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-09-28 09:39:53 +0000
commit9135ac20c0593f5f714fb3c4321c4eb019121fa6 (patch)
tree03fc1f57a577a373bf6234e60d40f62b729bea66 /lib/mini
parentef310aea3f81aff558faa53b7ebcbb4561a08e5d (diff)
downloadruby-9135ac20c0593f5f714fb3c4321c4eb019121fa6.tar.gz
ruby-9135ac20c0593f5f714fb3c4321c4eb019121fa6.tar.xz
ruby-9135ac20c0593f5f714fb3c4321c4eb019121fa6.zip
* lib/mini/test.rb (MINI_DIR): loaded path is expanded.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19606 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/mini')
-rw-r--r--lib/mini/test.rb16
1 files changed, 3 insertions, 13 deletions
diff --git a/lib/mini/test.rb b/lib/mini/test.rb
index e08d4dd93..a8a65821a 100644
--- a/lib/mini/test.rb
+++ b/lib/mini/test.rb
@@ -13,28 +13,18 @@
module Mini
class Assertion < Exception; end
- file = if __FILE__ =~ /^[^\.]/ then # OMG ruby 1.9 is so lame (rubinius too)
- require 'pathname'
- pwd = Pathname.new(Dir.pwd)
- pn = Pathname.new(File.expand_path(__FILE__))
- pn = File.join(".", pn.relative_path_from(pwd)) unless pn.relative?
- pn.to_s
- else
- __FILE__
- end
-
- MINI_DIR = File.dirname(File.dirname(file))
+ MINI_DIR = File.expand_path("../..", __FILE__)
def self.filter_backtrace bt
return ["No backtrace"] unless bt
new_bt = []
bt.each do |line|
- break if line.index(MINI_DIR) == 0
+ break if line.index(MINI_DIR, 0)
new_bt << line
end
- new_bt = bt.reject { |line| line.index(MINI_DIR) == 0 } if
+ new_bt = bt.reject { |line| line.index(MINI_DIR, 0) } if
new_bt.empty?
new_bt = bt.dup if new_bt.empty?