aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKazuki Yamaguchi <k@rhe.jp>2017-03-04 02:08:16 +0900
committerKazuki Yamaguchi <k@rhe.jp>2017-09-07 20:06:28 +0900
commit3f55f0e35b803a3e1b271251f84fa8af6df5576d (patch)
tree805d2270c22111aac08c9a48d981f4e81fe5b3b2
parent06f8fd502d29e731e79499c66f07ea6757a1a6ed (diff)
downloadmikutter-3f55f0e35b803a3e1b271251f84fa8af6df5576d.tar.gz
bundler/setup を test/helper.rb から test.rb にもってきた
-rwxr-xr-xtest.rb3
-rw-r--r--test/helper.rb12
2 files changed, 3 insertions, 12 deletions
diff --git a/test.rb b/test.rb
index 33446d6b..9b4d92e4 100755
--- a/test.rb
+++ b/test.rb
@@ -3,6 +3,9 @@
exec ruby -x "$0" "$@"
#!ruby
+ENV['BUNDLE_GEMFILE'] = File.expand_path("Gemfile", __dir__)
+require 'bundler/setup'
+
successed = []
failed = []
processes = {}
diff --git a/test/helper.rb b/test/helper.rb
index 19a457d7..a9b382a4 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -1,15 +1,3 @@
-ENV['BUNDLE_GEMFILE'] = File.expand_path(File.join(File.dirname(__FILE__), "..", "Gemfile"))
-require 'rubygems'
-require 'bundler/setup'
-
-begin
- Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
- $stderr.puts e.message
- $stderr.puts "Run `bundle install` to install missing gems"
- exit e.status_code
-end
-
require 'test/unit'
require 'mocha/setup'