Move common setup into test_helper.rb

9 files changed, 18 insertions, 16 deletions

diff --git a/tests/setup_variant.rb b/tests/test_helper.rb
index 2dab184..abc9112 100644
--- a/tests/setup_variant.rb
+++ b/tests/test_helper.rb
@@ -1,3 +1,6 @@
+
+gem 'json', File.read('VERSION').chomp
+
 case ENV['JSON']
 when 'pure'
   $:.unshift 'lib'
@@ -9,3 +12,9 @@ else
   $:.unshift 'ext', 'lib'
   require 'json'
 end
+
+require 'test/unit'
+begin
+  require 'byebug'
+rescue LoadError
+end
diff --git a/tests/test_json.rb b/tests/test_json.rb
index 7957773..b666dfa 100755
--- a/tests/test_json.rb
+++ b/tests/test_json.rb
@@ -1,8 +1,7 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
 
-require 'test/unit'
-require File.join(File.dirname(__FILE__), 'setup_variant')
+require 'test_helper'
 require 'stringio'
 require 'tempfile'
 require 'ostruct'
diff --git a/tests/test_json_addition.rb b/tests/test_json_addition.rb
index a30f06a..1105705 100755
--- a/tests/test_json_addition.rb
+++ b/tests/test_json_addition.rb
@@ -1,8 +1,7 @@
 #!/usr/bin/env ruby
 # -*- coding:utf-8 -*-
 
-require 'test/unit'
-require File.join(File.dirname(__FILE__), 'setup_variant')
+require 'test_helper'
 require 'json/add/core'
 require 'json/add/complex'
 require 'json/add/rational'
diff --git a/tests/test_json_encoding.rb b/tests/test_json_encoding.rb
index fa7d878..3536c56 100644
--- a/tests/test_json_encoding.rb
+++ b/tests/test_json_encoding.rb
@@ -1,8 +1,7 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
 
-require 'test/unit'
-require File.join(File.dirname(__FILE__), 'setup_variant')
+require 'test_helper'
 
 class TestJSONEncoding < Test::Unit::TestCase
   include JSON
diff --git a/tests/test_json_fixtures.rb b/tests/test_json_fixtures.rb
index 584dffd..d580522 100755
--- a/tests/test_json_fixtures.rb
+++ b/tests/test_json_fixtures.rb
@@ -1,8 +1,7 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
 
-require 'test/unit'
-require File.join(File.dirname(__FILE__), 'setup_variant')
+require 'test_helper'
 
 class TestJSONFixtures < Test::Unit::TestCase
   def setup
diff --git a/tests/test_json_generate.rb b/tests/test_json_generate.rb
index 8db0b78..2fe4760 100755
--- a/tests/test_json_generate.rb
+++ b/tests/test_json_generate.rb
@@ -1,8 +1,7 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
 
-require 'test/unit'
-require File.join(File.dirname(__FILE__), 'setup_variant')
+require 'test_helper'
 
 class TestJSONGenerate < Test::Unit::TestCase
   include JSON
diff --git a/tests/test_json_generic_object.rb b/tests/test_json_generic_object.rb
index c43c776..66fc18d 100644
--- a/tests/test_json_generic_object.rb
+++ b/tests/test_json_generic_object.rb
@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
 
-require 'test/unit'
-require File.join(File.dirname(__FILE__), 'setup_variant')
+require 'test_helper'
+
 class TestJSONGenericObject < Test::Unit::TestCase
   include JSON
 
diff --git a/tests/test_json_string_matching.rb b/tests/test_json_string_matching.rb
index c233df8..2b89588 100644
--- a/tests/test_json_string_matching.rb
+++ b/tests/test_json_string_matching.rb
@@ -1,8 +1,7 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
 
-require 'test/unit'
-require File.join(File.dirname(__FILE__), 'setup_variant')
+require 'test_helper'
 require 'stringio'
 require 'time'
 
diff --git a/tests/test_json_unicode.rb b/tests/test_json_unicode.rb
index 8352d5c..f59c36a 100755
--- a/tests/test_json_unicode.rb
+++ b/tests/test_json_unicode.rb
@@ -1,8 +1,7 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
 
-require 'test/unit'
-require File.join(File.dirname(__FILE__), 'setup_variant')
+require 'test_helper'
 
 class TestJSONUnicode < Test::Unit::TestCase
   include JSON