Permalink
Browse files

Fixed up duplicate test methods.

  • Loading branch information...
1 parent 9f950bc commit c5cccbdbc99797f05f6aa914e826b59a58181742 @treeder treeder committed Apr 6, 2012
Showing with 43 additions and 43 deletions.
  1. +2 −1 test/Gemfile
  2. +37 −34 test/Gemfile.lock
  3. +1 −1 test/quick_schedule.rb
  4. +2 −6 test/test_base.rb
  5. +1 −1 test/test_scheduling_no_active_support.rb
View
@@ -2,13 +2,14 @@
source 'http://rubygems.org'
-gem 'rack', '< 1.4'
+gem 'rack'
gem 'iron_worker'
gem 'test-unit'
gem 'jeweler2'
gem 'zip'
gem 'rest'
gem 'typhoeus'
+gem 'uber_config'
gem 'simple_record'
gem 'activerecord'
View
@@ -1,19 +1,19 @@
GEM
remote: http://rubygems.org/
specs:
- activemodel (3.2.1)
- activesupport (= 3.2.1)
+ activemodel (3.2.3)
+ activesupport (= 3.2.3)
builder (~> 3.0.0)
- activerecord (3.2.1)
- activemodel (= 3.2.1)
- activesupport (= 3.2.1)
- arel (~> 3.0.0)
+ activerecord (3.2.3)
+ activemodel (= 3.2.3)
+ activesupport (= 3.2.3)
+ arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activesupport (3.2.1)
+ activesupport (3.2.3)
i18n (~> 0.6)
multi_json (~> 1.0)
addressable (2.2.7)
- arel (3.0.0)
+ arel (3.0.2)
aws (2.5.6)
http_connection
uuidtools
@@ -22,10 +22,11 @@ GEM
builder
mime-types
xml-simple
- bson (1.5.2)
+ bson (1.6.1)
builder (3.0.0)
- carrierwave (0.5.8)
- activesupport (~> 3.0)
+ carrierwave (0.6.1)
+ activemodel (>= 3.2.0)
+ activesupport (>= 3.2.0)
concur (0.1.2)
em-http-request
em-http-request
@@ -41,26 +42,26 @@ GEM
mechanize (>= 1.0.0)
multipart-post (>= 1.0)
oauth (>= 0.3.6)
- em-http-request (1.0.1)
+ em-http-request (1.0.2)
addressable (>= 2.2.3)
cookiejar
em-socksify
eventmachine (>= 1.0.0.beta.4)
http_parser.rb (>= 0.5.3)
- em-socksify (0.1.0)
- eventmachine
+ em-socksify (0.2.0)
+ eventmachine (>= 1.0.0.beta.4)
eventmachine (1.0.0.beta.4)
- excon (0.9.5)
+ excon (0.13.2)
faraday (0.7.6)
addressable (~> 2.2)
multipart-post (~> 1.1)
rack (~> 1.1)
- fog (1.1.2)
+ fog (1.3.1)
builder
- excon (~> 0.9.0)
+ excon (~> 0.13.0)
formatador (~> 0.2.0)
mime-types
- multi_json (~> 1.0.3)
+ multi_json (~> 1.0)
net-scp (~> 1.0.4)
net-ssh (>= 2.1.3)
nokogiri (~> 1.5.0)
@@ -76,7 +77,7 @@ GEM
rest
rest-client
rest-client
- iron_worker (2.3.12)
+ iron_worker (2.3.13)
bundler
bundler
rest
@@ -87,41 +88,41 @@ GEM
zip
jeweler2 (2.0.9)
git (>= 1.2.5)
- json (1.6.5)
+ json (1.6.6)
logglier (0.2.7)
- mail (2.4.1)
+ mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mechanize (2.2.1)
+ mechanize (2.3)
domain_name (~> 0.5, >= 0.5.1)
mime-types (~> 1.17, >= 1.17.2)
net-http-digest_auth (~> 1.1, >= 1.1.1)
net-http-persistent (~> 2.5, >= 2.5.2)
nokogiri (~> 1.4)
ntlm-http (~> 0.1, >= 0.1.1)
webrobots (~> 0.0, >= 0.0.9)
- mime-types (1.17.2)
+ mime-types (1.18)
mini_fb (1.1.7)
hashie
rest-client
- mongo (1.5.2)
- bson (= 1.5.2)
- mongoid (2.4.4)
+ mongo (1.6.1)
+ bson (~> 1.6.1)
+ mongoid (2.4.7)
activemodel (~> 3.1)
mongo (~> 1.3)
tzinfo (~> 0.3.22)
mongoid_i18n (0.5.1)
mongoid (>= 2.1.0)
- multi_json (1.0.4)
+ multi_json (1.2.0)
multipart-post (1.1.5)
mysql2 (0.3.11)
net-http-digest_auth (1.2)
- net-http-persistent (2.5.2)
+ net-http-persistent (2.6)
net-scp (1.0.4)
net-ssh (>= 1.99.1)
net-ssh (2.3.0)
- nokogiri (1.5.0)
+ nokogiri (1.5.2)
ntlm-http (0.1.1)
oauth (0.4.5)
polyglot (0.3.3)
@@ -130,7 +131,7 @@ GEM
ruby-hmac (~> 0.4.0)
signature (~> 0.1.2)
rack (1.3.6)
- rest (0.1.0)
+ rest (0.2.0)
rest-client
rest-client
rest-client (1.6.7)
@@ -141,15 +142,16 @@ GEM
simple_record (2.2.0)
aws
concur
- test-unit (2.4.7)
+ test-unit (2.4.8)
timecop (0.3.5)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
typhoeus (0.3.3)
mime-types
- tzinfo (0.3.31)
- unf (0.0.4)
+ tzinfo (0.3.32)
+ uber_config (0.0.1)
+ unf (0.0.5)
unf_ext
unf_ext (0.0.4)
uuidtools (2.1.2)
@@ -177,11 +179,12 @@ DEPENDENCIES
mongoid_i18n
mysql2
pusher
- rack (< 1.4)
+ rack
rest
signature
simple_record
test-unit
timecop
typhoeus
+ uber_config
zip
View
@@ -6,7 +6,7 @@
class QuickRun < TestBase
- def test_scheduler
+ def test_scheduler_quick
worker = TestWorker.new
worker.schedule(:start_at=>10.seconds.from_now)
status = worker.wait_until_complete
View
@@ -4,6 +4,7 @@
gem 'test-unit'
require 'test/unit'
require 'yaml'
+require 'uber_config'
begin
require File.join(File.dirname(__FILE__), '../lib/iron_worker')
rescue Exception => ex
@@ -23,12 +24,7 @@
class TestBase < Test::Unit::TestCase
def setup
- if defined? $abt_config
- @config = $abt_config
- else
- @config =YAML::load_file(File.expand_path(File.join("~", "Dropbox", "configs", "iron_worker_ruby", "test", "config.yml")))
- end
-# @config = YAML::load_file(File.join(File.dirname(__FILE__), "config.yml"))
+ @config = UberConfig.load
puts "config: " + @config.inspect
@token = @config['iron_worker']['token']
@@ -4,7 +4,7 @@
class IronWorkerTests < TestBase
- def test_scheduler
+ def test_scheduler_no_as
worker = OneLineWorker.new
start_time = Time.now

0 comments on commit c5cccbd

Please sign in to comment.