Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Bundle update and using Turn wherever possible

  • Loading branch information...
commit 07eafe38b2c55cd2f908b4e37a1932d812aacd71 1 parent cc6eb1d
@joelmoss joelmoss authored
Showing with 43 additions and 37 deletions.
  1. +1 −0  Gemfile
  2. +41 −37 Gemfile.lock
  3. +1 −0  test/test_helper.rb
View
1  Gemfile
@@ -4,3 +4,4 @@ gemspec
gem 'rails', '~> 3.1'
gem 'mocha'
+gem 'turn'
View
78 Gemfile.lock
@@ -8,50 +8,51 @@ PATH
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.2.2)
- actionpack (= 3.2.2)
- mail (~> 2.4.0)
- actionpack (3.2.2)
- activemodel (= 3.2.2)
- activesupport (= 3.2.2)
+ actionmailer (3.2.6)
+ actionpack (= 3.2.6)
+ mail (~> 2.4.4)
+ actionpack (3.2.6)
+ activemodel (= 3.2.6)
+ activesupport (= 3.2.6)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.1)
rack (~> 1.4.0)
- rack-cache (~> 1.1)
+ rack-cache (~> 1.2)
rack-test (~> 0.6.1)
- sprockets (~> 2.1.2)
- activemodel (3.2.2)
- activesupport (= 3.2.2)
+ sprockets (~> 2.1.3)
+ activemodel (3.2.6)
+ activesupport (= 3.2.6)
builder (~> 3.0.0)
- activerecord (3.2.2)
- activemodel (= 3.2.2)
- activesupport (= 3.2.2)
+ activerecord (3.2.6)
+ activemodel (= 3.2.6)
+ activesupport (= 3.2.6)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.2)
- activemodel (= 3.2.2)
- activesupport (= 3.2.2)
- activesupport (3.2.2)
+ activeresource (3.2.6)
+ activemodel (= 3.2.6)
+ activesupport (= 3.2.6)
+ activesupport (3.2.6)
i18n (~> 0.6)
multi_json (~> 1.0)
+ ansi (1.4.3)
arel (3.0.2)
builder (3.0.0)
erubis (2.7.0)
has_scope (0.5.1)
hike (1.2.1)
i18n (0.6.0)
- journey (1.0.3)
- json (1.6.5)
- mail (2.4.3)
+ journey (1.0.4)
+ json (1.7.3)
+ mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
metaclass (0.0.1)
- mime-types (1.17.2)
- mocha (0.10.0)
+ mime-types (1.19)
+ mocha (0.12.0)
metaclass (~> 0.0.1)
- multi_json (1.1.0)
+ multi_json (1.3.6)
polyglot (0.3.3)
rack (1.4.1)
rack-cache (1.2)
@@ -60,36 +61,38 @@ GEM
rack
rack-test (0.6.1)
rack (>= 1.0)
- rails (3.2.2)
- actionmailer (= 3.2.2)
- actionpack (= 3.2.2)
- activerecord (= 3.2.2)
- activeresource (= 3.2.2)
- activesupport (= 3.2.2)
+ rails (3.2.6)
+ actionmailer (= 3.2.6)
+ actionpack (= 3.2.6)
+ activerecord (= 3.2.6)
+ activeresource (= 3.2.6)
+ activesupport (= 3.2.6)
bundler (~> 1.0)
- railties (= 3.2.2)
- railties (3.2.2)
- actionpack (= 3.2.2)
- activesupport (= 3.2.2)
+ railties (= 3.2.6)
+ railties (3.2.6)
+ actionpack (= 3.2.6)
+ activesupport (= 3.2.6)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
- thor (~> 0.14.6)
+ thor (>= 0.14.6, < 2.0)
rake (0.9.2.2)
rdoc (3.12)
json (~> 1.4)
responders (0.9.1)
railties (~> 3.1)
- sprockets (2.1.2)
+ sprockets (2.1.3)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- thor (0.14.6)
+ thor (0.15.4)
tilt (1.3.3)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.32)
+ turn (0.9.6)
+ ansi
+ tzinfo (0.3.33)
PLATFORMS
ruby
@@ -98,3 +101,4 @@ DEPENDENCIES
inherited_resources!
mocha
rails (~> 3.1)
+ turn
View
1  test/test_helper.rb
@@ -5,6 +5,7 @@
require 'test/unit'
require 'mocha'
+begin; require 'turn/autorun'; rescue LoadError; end
ENV["RAILS_ENV"] = "test"
RAILS_ROOT = "anywhere"
Please sign in to comment.
Something went wrong with that request. Please try again.