gems update, cleanup capybara integration, moved rspec matchers to se…

…parate file

Gemfile

@@ -1,16 +1,16 @@
 source :gemcutter
 
-gem "rails", "=3.0.5"
-gem "sqlite3-ruby", :require => "sqlite3"
+gem "rails", "~> 3.0.5"
+gem "sqlite3"
 gem "will_paginate", "~> 3.0.pre2"
 gem "bson_ext"
 gem "haml"
-gem "bundler", ">=1.0.0"
+gem "sass"
+gem "compass"
 gem "formtastic"
 gem "friendly_id", "~> 3.1"
 gem "rdiscount"
 gem "faker"
-gem "compass"
 gem "state_machine"
 gem "rack-sprockets", :require => "rack/sprockets"
 gem "redis"
@@ -20,22 +20,20 @@ gem "concerned_with"
 gem "routing-filter"
 
 group :staging do
-#  gem "pg"
+  # gem "pg"
   gem "thin"
 end
 
 group :test, :development do
-  gem "factory_girl_rails"
-  gem "database_cleaner"
-  gem "rspec-rails"
-  gem "capybara", :git => "git://github.com/jnicklas/capybara.git"
+  gem "rspec-rails", ">= 2.6.0.rc4"
+  gem "ruby-debug"
 end
 
 group :test do
-  gem "webrat"
-  gem "test-unit"
-  gem "rspec"
   gem "selenium-webdriver"
+  gem "factory_girl_rails"
+  gem "database_cleaner"
+  gem "capybara", "~> 1.0.0.beta1"
 end
 
 group :development do
@@ -44,12 +42,3 @@ group :development do
   gem "metric_fu"
   gem "tolk", :git => "git://github.com/cover/tolk.git"
 end
-
-#group :cucumber do
-  #gem "cucumber-rails"
-  #gem "pickle"
-  #gem "capybara", "=0.3.9"
-  #gem "launchy"
-  #gem "selenium-webdriver"
-#end
-