From adaee857fb59b8fc02860b62f1a54820758a3423 Mon Sep 17 00:00:00 2001 From: Michael Hartl Date: Thu, 14 Oct 2010 21:26:01 -0700 Subject: [PATCH] Now using RSpec 2.0.0 with Spork/Autotest workaround --- .rspec | 3 +- Gemfile | 11 +++--- Gemfile.lock | 106 ++++++++++++++++++++++++++------------------------- 3 files changed, 62 insertions(+), 58 deletions(-) diff --git a/.rspec b/.rspec index 32c26c2..d571129 100644 --- a/.rspec +++ b/.rspec @@ -1,2 +1,3 @@ --colour ---drb \ No newline at end of file +--drb +--autotest diff --git a/Gemfile b/Gemfile index 18ff84b..4589296 100644 --- a/Gemfile +++ b/Gemfile @@ -1,18 +1,19 @@ source 'http://rubygems.org' -gem 'rails', '3.0.0.rc' -gem 'sqlite3-ruby', '1.2.5', :require => 'sqlite3' +gem 'rails', '3.0.0' gem 'gravatar_image_tag', '0.1.0' -gem 'will_paginate', '3.0.pre' +gem 'will_paginate', '3.0.pre2' +gem 'sqlite3-ruby', '1.2.5', :require => 'sqlite3' group :development do - gem 'rspec-rails', '2.0.0.beta.18' + gem 'rspec-rails', '2.0.0' gem 'annotate-models', '1.0.4' gem 'faker', '0.3.1' end group :test do - gem 'rspec', '2.0.0.beta.18' + gem 'rspec', '2.0.0' + gem 'webrat', '0.7.1' gem 'spork', '0.8.4' gem 'factory_girl_rails', '1.0' end diff --git a/Gemfile.lock b/Gemfile.lock index 77470ba..2cee5f8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,35 +2,35 @@ GEM remote: http://rubygems.org/ specs: abstract (1.0.0) - actionmailer (3.0.0.rc) - actionpack (= 3.0.0.rc) + actionmailer (3.0.0) + actionpack (= 3.0.0) mail (~> 2.2.5) - actionpack (3.0.0.rc) - activemodel (= 3.0.0.rc) - activesupport (= 3.0.0.rc) + actionpack (3.0.0) + activemodel (= 3.0.0) + activesupport (= 3.0.0) builder (~> 2.1.2) erubis (~> 2.6.6) i18n (~> 0.4.1) rack (~> 1.2.1) - rack-mount (~> 0.6.9) + rack-mount (~> 0.6.12) rack-test (~> 0.5.4) - tzinfo (~> 0.3.22) - activemodel (3.0.0.rc) - activesupport (= 3.0.0.rc) + tzinfo (~> 0.3.23) + activemodel (3.0.0) + activesupport (= 3.0.0) builder (~> 2.1.2) i18n (~> 0.4.1) - activerecord (3.0.0.rc) - activemodel (= 3.0.0.rc) - activesupport (= 3.0.0.rc) - arel (~> 0.4.0) - tzinfo (~> 0.3.22) - activeresource (3.0.0.rc) - activemodel (= 3.0.0.rc) - activesupport (= 3.0.0.rc) - activesupport (3.0.0.rc) + activerecord (3.0.0) + activemodel (= 3.0.0) + activesupport (= 3.0.0) + arel (~> 1.0.0) + tzinfo (~> 0.3.23) + activeresource (3.0.0) + activemodel (= 3.0.0) + activesupport (= 3.0.0) + activesupport (3.0.0) annotate-models (1.0.4) - arel (0.4.0) - activesupport (>= 3.0.0.beta) + arel (1.0.1) + activesupport (~> 3.0.0) builder (2.1.2) diff-lcs (1.1.2) erubis (2.6.6) @@ -42,7 +42,7 @@ GEM faker (0.3.1) gravatar_image_tag (0.1.0) i18n (0.4.1) - mail (2.2.5) + mail (2.2.7) activesupport (>= 2.3.6) mime-types treetop (>= 1.4.5) @@ -50,46 +50,47 @@ GEM nokogiri (1.4.3.1) polyglot (0.3.1) rack (1.2.1) - rack-mount (0.6.9) + rack-mount (0.6.13) rack (>= 1.0.0) - rack-test (0.5.4) + rack-test (0.5.6) rack (>= 1.0) - rails (3.0.0.rc) - actionmailer (= 3.0.0.rc) - actionpack (= 3.0.0.rc) - activerecord (= 3.0.0.rc) - activeresource (= 3.0.0.rc) - activesupport (= 3.0.0.rc) - bundler (>= 1.0.0.rc.1) - railties (= 3.0.0.rc) - railties (3.0.0.rc) - actionpack (= 3.0.0.rc) - activesupport (= 3.0.0.rc) - rake (>= 0.8.3) + rails (3.0.0) + actionmailer (= 3.0.0) + actionpack (= 3.0.0) + activerecord (= 3.0.0) + activeresource (= 3.0.0) + activesupport (= 3.0.0) + bundler (~> 1.0.0) + railties (= 3.0.0) + railties (3.0.0) + actionpack (= 3.0.0) + activesupport (= 3.0.0) + rake (>= 0.8.4) thor (~> 0.14.0) rake (0.8.7) - rspec (2.0.0.beta.18) - rspec-core (= 2.0.0.beta.18) - rspec-expectations (= 2.0.0.beta.18) - rspec-mocks (= 2.0.0.beta.18) - rspec-core (2.0.0.beta.18) - rspec-expectations (2.0.0.beta.18) + rspec (2.0.0) + rspec-core (= 2.0.0) + rspec-expectations (= 2.0.0) + rspec-mocks (= 2.0.0) + rspec-core (2.0.0) + rspec-expectations (2.0.0) diff-lcs (>= 1.1.2) - rspec-mocks (2.0.0.beta.18) - rspec-rails (2.0.0.beta.18) - rspec (>= 2.0.0.beta.14) - webrat (>= 0.7.0) + rspec-mocks (2.0.0) + rspec-core (= 2.0.0) + rspec-expectations (= 2.0.0) + rspec-rails (2.0.0) + rspec (= 2.0.0) spork (0.8.4) sqlite3-ruby (1.2.5) - thor (0.14.0) + thor (0.14.3) treetop (1.4.8) polyglot (>= 0.3.1) - tzinfo (0.3.22) + tzinfo (0.3.23) webrat (0.7.1) nokogiri (>= 1.2.0) rack (>= 1.0) rack-test (>= 0.5.3) - will_paginate (3.0.pre) + will_paginate (3.0.pre2) PLATFORMS ruby @@ -99,9 +100,10 @@ DEPENDENCIES factory_girl_rails (= 1.0) faker (= 0.3.1) gravatar_image_tag (= 0.1.0) - rails (= 3.0.0.rc) - rspec (= 2.0.0.beta.18) - rspec-rails (= 2.0.0.beta.18) + rails (= 3.0.0) + rspec (= 2.0.0) + rspec-rails (= 2.0.0) spork (= 0.8.4) sqlite3-ruby (= 1.2.5) - will_paginate (= 3.0.pre) + webrat (= 0.7.1) + will_paginate (= 3.0.pre2)