Permalink
Browse files

Reorganization of helper dependencies so we can use bundler to do mor…

…e gem loading
  • Loading branch information...
1 parent b93e7eb commit b762cec5199aa5af54f27e1eab93f3a92d57c69a @matschaffer committed May 25, 2012
Showing with 18 additions and 59 deletions.
  1. +2 −6 Gemfile
  2. +0 −41 Gemfile.lock
  3. +8 −3 test/integration_helper.rb
  4. +2 −0 test/support/integration_test.rb
  5. +5 −0 test/support/test_case.rb
  6. +1 −9 test/test_helper.rb
View
@@ -1,14 +1,10 @@
source :rubygems
gemspec
-group :development do
- gem 'irbtools'
-end
-
group :test do
gem 'parallel'
- gem 'mocha', :require => false
- gem 'minitest', :require => false
+ gem 'minitest', :require => 'minitest/autorun'
+ gem 'mocha'
end
group :development, :test do
View
@@ -10,8 +10,6 @@ GEM
remote: http://rubygems.org/
specs:
archive-tar-minitar (0.5.2)
- awesome_print (1.0.2)
- boson (1.1.1)
builder (3.0.0)
bunny (0.7.9)
chef (0.10.10)
@@ -32,7 +30,6 @@ GEM
treetop (~> 1.4.9)
uuidtools
yajl-ruby (>= 1.1.0)
- clipboard (1.0.1)
coderay (1.0.6)
columnize (0.3.6)
debugger (1.1.3)
@@ -43,11 +40,7 @@ GEM
debugger-ruby_core_source (>= 1.1.1)
debugger-ruby_core_source (1.1.2)
erubis (2.7.0)
- every_day_irb (1.2.2)
excon (0.13.4)
- fancy_irb (0.7.2)
- paint (>= 0.8.1)
- unicode-display_width (>= 0.1.1)
fog (1.3.1)
builder
excon (~> 0.13.0)
@@ -59,31 +52,8 @@ GEM
nokogiri (~> 1.5.0)
ruby-hmac
formatador (0.2.3)
- g (1.6.0)
- ruby_gntp
highline (1.6.12)
- hirb (0.6.2)
- interactive_editor (0.0.10)
- spoon (>= 0.0.1)
ipaddress (0.8.0)
- irbtools (1.2.2)
- awesome_print (~> 1.0.2)
- boson (~> 1.1.1)
- clipboard (~> 1.0.1)
- coderay (~> 1.0.5)
- every_day_irb (>= 1.2.2)
- fancy_irb (>= 0.7.2)
- g (>= 1.5.0)
- hirb (~> 0.6.1)
- interactive_editor (>= 0.0.10)
- method_locator (>= 0.0.4)
- method_source (>= 0.7.0)
- methodfinder (>= 1.2.5)
- ori (~> 0.1.0)
- paint (>= 0.8.4)
- sketches (>= 0.1.1)
- wirb (>= 0.4.2)
- zucker (>= 12.1)
json (1.6.1)
librarian (0.0.23)
archive-tar-minitar (>= 0.5.2)
@@ -93,9 +63,7 @@ GEM
linecache (0.46)
rbx-require-relative (> 0.0.4)
metaclass (0.0.1)
- method_locator (0.0.4)
method_source (0.7.1)
- methodfinder (1.2.5)
mime-types (1.18)
minitest (3.0.0)
mixlib-authentication (1.1.4)
@@ -124,8 +92,6 @@ GEM
mixlib-log
systemu
yajl-ruby
- ori (0.1.0)
- paint (0.8.4)
parallel (0.5.16)
polyglot (0.3.3)
pry (0.9.9.6)
@@ -142,28 +108,21 @@ GEM
ruby-debug-base (0.10.4)
linecache (>= 0.3)
ruby-hmac (0.4.0)
- ruby_gntp (0.3.4)
- sketches (0.1.1)
slop (2.4.4)
- spoon (0.0.1)
systemu (2.5.0)
thor (0.15.2)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
- unicode-display_width (0.1.1)
uuidtools (2.1.2)
- wirb (0.4.2)
yajl-ruby (1.1.0)
- zucker (12.1)
PLATFORMS
ruby
DEPENDENCIES
debugger
fog
- irbtools
knife-solo!
minitest
mocha
View
@@ -1,11 +1,16 @@
-require 'test_helper'
+require 'rubygems'
+require 'bundler'
+
+Bundler.require
+require 'minitest/parallel'
+Bundler.require(:test)
+
require 'pathname'
+$base_dir = Pathname.new(__FILE__).dirname
require 'support/loggable'
require 'support/ec2_runner'
require 'support/integration_test'
-$base_dir = Pathname.new(__FILE__).dirname
-
MiniTest::Parallel.processor_count = 5
MiniTest::Unit.runner = EC2Runner.new
@@ -1,6 +1,8 @@
require 'json'
require 'net/http'
+require 'support/test_case'
+
# Base class for EC2 integration tests
class IntegrationTest < TestCase
include Loggable
@@ -0,0 +1,5 @@
+class TestCase < MiniTest::Unit::TestCase
+ def default_test
+ super unless self.class == TestCase
+ end
+end
View
@@ -4,12 +4,4 @@
Bundler.require
Bundler.require(:test)
-require 'minitest/parallel'
-require 'minitest/autorun'
-require 'mocha'
-
-class TestCase < MiniTest::Unit::TestCase
- def default_test
- super unless self.class == TestCase
- end
-end
+require 'support/test_case'

0 comments on commit b762cec

Please sign in to comment.