Skip to content
This repository has been archived by the owner on Apr 15, 2023. It is now read-only.

Commit

Permalink
Updated to Rails version 3.1.0rc4
Browse files Browse the repository at this point in the history
Added launchy to the test gems in order to use save_and_open_page in acceptance tests
  • Loading branch information
Overbryd authored and Jeff Kreeftmeijer committed Jun 24, 2011
1 parent 131d122 commit 5a21c6f
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 32 deletions.
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'http://rubygems.org'

gem 'rails', '3.1.0.rc1' # :git => 'git://github.com/rails/rails.git'
gem 'rails', '3.1.0.rc4' # :git => 'git://github.com/rails/rails.git'

gem 'thin'

Expand Down Expand Up @@ -29,6 +29,7 @@ gem 'hoptoad_notifier'
group :test do
gem 'rspec-rails'
gem 'capybara', :git => 'git://github.com/jnicklas/capybara.git', :ref => '549e6733'
gem 'launchy'

gem 'mocha'

Expand Down
69 changes: 38 additions & 31 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -23,35 +23,35 @@ GEM
remote: http://rubygems.org/
specs:
RedCloth (4.2.7)
actionmailer (3.1.0.rc1)
actionpack (= 3.1.0.rc1)
actionmailer (3.1.0.rc4)
actionpack (= 3.1.0.rc4)
mail (~> 2.3.0)
actionpack (3.1.0.rc1)
activemodel (= 3.1.0.rc1)
activesupport (= 3.1.0.rc1)
actionpack (3.1.0.rc4)
activemodel (= 3.1.0.rc4)
activesupport (= 3.1.0.rc4)
builder (~> 3.0.0)
erubis (~> 2.7.0)
i18n (~> 0.6.0beta1)
rack (~> 1.3.0.beta2)
i18n (~> 0.6)
rack (~> 1.3.0)
rack-cache (~> 1.0.1)
rack-mount (~> 0.8.1)
rack-test (~> 0.6.0)
sprockets (~> 2.0.0.beta.5)
sprockets (~> 2.0.0.beta.10)
tzinfo (~> 0.3.27)
activemodel (3.1.0.rc1)
activesupport (= 3.1.0.rc1)
activemodel (3.1.0.rc4)
activesupport (= 3.1.0.rc4)
bcrypt-ruby (~> 2.1.4)
builder (~> 3.0.0)
i18n (~> 0.6.0beta1)
activerecord (3.1.0.rc1)
activemodel (= 3.1.0.rc1)
activesupport (= 3.1.0.rc1)
i18n (~> 0.6)
activerecord (3.1.0.rc4)
activemodel (= 3.1.0.rc4)
activesupport (= 3.1.0.rc4)
arel (~> 2.1.1)
tzinfo (~> 0.3.27)
activeresource (3.1.0.rc1)
activemodel (= 3.1.0.rc1)
activesupport (= 3.1.0.rc1)
activesupport (3.1.0.rc1)
activeresource (3.1.0.rc4)
activemodel (= 3.1.0.rc4)
activesupport (= 3.1.0.rc4)
activesupport (3.1.0.rc4)
multi_json (~> 1.0)
addressable (2.2.4)
arel (2.1.1)
Expand All @@ -66,6 +66,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.1.1)
configuration (1.3.1)
daemons (1.1.3)
database_cleaner (0.6.4)
diff-lcs (1.1.2)
Expand All @@ -87,7 +88,7 @@ GEM
ruby-progressbar (~> 0.0.10)
gravtastic (3.1.0)
haml (3.1.2)
hike (1.0.0)
hike (1.1.0)
hoptoad_notifier (2.4.11)
activesupport
builder
Expand All @@ -98,6 +99,9 @@ GEM
json (1.5.1)
json_pure (1.5.1)
kramdown (0.13.3)
launchy (0.4.0)
configuration (>= 0.0.5)
rake (>= 0.8.1)
mail (2.3.0)
i18n (>= 0.4.0)
mime-types (~> 1.16)
Expand Down Expand Up @@ -172,21 +176,23 @@ GEM
rack
rack-test (0.6.0)
rack (>= 1.0)
rails (3.1.0.rc1)
actionmailer (= 3.1.0.rc1)
actionpack (= 3.1.0.rc1)
activerecord (= 3.1.0.rc1)
activeresource (= 3.1.0.rc1)
activesupport (= 3.1.0.rc1)
rails (3.1.0.rc4)
actionmailer (= 3.1.0.rc4)
actionpack (= 3.1.0.rc4)
activerecord (= 3.1.0.rc4)
activeresource (= 3.1.0.rc4)
activesupport (= 3.1.0.rc4)
bundler (~> 1.0)
railties (= 3.1.0.rc1)
railties (3.1.0.rc1)
actionpack (= 3.1.0.rc1)
activesupport (= 3.1.0.rc1)
railties (= 3.1.0.rc4)
railties (3.1.0.rc4)
actionpack (= 3.1.0.rc4)
activesupport (= 3.1.0.rc4)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)
rake (0.9.2)
rdoc (3.6.1)
rest-client (1.6.1)
mime-types (>= 1.16)
rpm_contrib (1.0.13)
Expand Down Expand Up @@ -235,7 +241,7 @@ GEM
timecop (0.3.5)
treetop (1.4.9)
polyglot (>= 0.3.1)
tzinfo (0.3.27)
tzinfo (0.3.28)
uglifier (0.5.4)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
Expand Down Expand Up @@ -263,11 +269,12 @@ DEPENDENCIES
jquery-rails
json
kramdown
launchy
mocha
mongoid (~> 2.0)
mongoid_slug
omniauth
rails (= 3.1.0.rc1)
rails (= 3.1.0.rc4)
rpm_contrib
rspec-rails
sass
Expand Down

0 comments on commit 5a21c6f

Please sign in to comment.