summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Arko <andre@arko.net>2011-12-21 11:32:57 -0800
committerAndre Arko <andre@arko.net>2011-12-21 12:52:25 -0800
commit2a2158f09af23ac2f6ec4b44996c17f24af35ccc (patch)
tree7faaf5365d9d495e9ef8962656f1a486e0fedd0f
parent9e1540c5d59b482869480ba138f4a4337ec78007 (diff)
downloadbundler-2a2158f09af23ac2f6ec4b44996c17f24af35ccc.tar.gz
work with textmate's broken syntax highlighting
-rw-r--r--spec/support/helpers.rb12
1 files changed, 6 insertions, 6 deletions
diff --git a/spec/support/helpers.rb b/spec/support/helpers.rb
index b65612c319..1466dc992a 100644
--- a/spec/support/helpers.rb
+++ b/spec/support/helpers.rb
@@ -35,14 +35,14 @@ module Spec
@out = ruby(setup + cmd, :expect_err => expect_err, :env => env)
end
- def load_error_run(ruby, gem, *args)
- cmd = <<-R
+ def load_error_run(ruby, name, *args)
+ cmd = <<-RUBY
begin
#{ruby}
rescue LoadError => e
- $stderr.puts "ZOMG LOAD ERROR" if e.message.include?("-- #{gem}")
+ $stderr.puts "ZOMG LOAD ERROR" if e.message.include?("-- #{name}")
end
- R
+ RUBY
opts = args.last.is_a?(Hash) ? args.pop : {}
opts.merge!(:expect_err => true)
args += [opts]
@@ -87,12 +87,12 @@ module Spec
sys_exec(%{#{env}#{Gem.ruby}#{lib_option} -e "#{ruby}"}, expect_err)
end
- def load_error_ruby(ruby, gem, opts = {})
+ def load_error_ruby(ruby, name, opts = {})
cmd = <<-R
begin
#{ruby}
rescue LoadError => e
- $stderr.puts "ZOMG LOAD ERROR"# if e.message.include?("-- #{gem}")
+ $stderr.puts "ZOMG LOAD ERROR"# if e.message.include?("-- #{name}")
end
R
ruby(cmd, opts.merge(:expect_err => true))