tdiary/tdiary-core [master] use capybara/rspec

[<nul...@cl...>]

SHIBATA Hiroshi	2011-02-20 13:00:12 +0000 (Sun, 20 Feb 2011)

  New Revision: f13f5a900b24ad8ca98921d25972a1c3020941cc

  Log:
    use capybara/rspec

  Modified files:
    Gemfile
    spec/acceptance/acceptance_helper.rb

  Modified: Gemfile (+1 -1)
===================================================================
--- Gemfile    2011-02-20 12:48:42 +0000 (26035ec)
+++ Gemfile    2011-02-20 13:00:12 +0000 (670a6fa)
@@ -7,5 +7,5 @@ gem 'rspec'
 gem 'rcov'
 gem 'steak'
 gem 'fuubar'
-gem 'capybara'
+gem 'capybara', :require => 'capybara/rspec'
 gem 'launchy'

  Modified: spec/acceptance/acceptance_helper.rb (+0 -3)
===================================================================
--- spec/acceptance/acceptance_helper.rb    2011-02-20 12:48:42 +0000 (ead48fb)
+++ spec/acceptance/acceptance_helper.rb    2011-02-20 13:00:12 +0000 (d49f505)
@@ -1,10 +1,7 @@
 require File.dirname(__FILE__) + "/../spec_helper"
 require File.dirname(__FILE__) + '/../../tdiary/tdiary_application'
-require 'capybara/dsl'
 
 RSpec.configure do |config|
-	config.include Capybara
-
 	fixture_conf = File.expand_path('../fixtures/just_installed.conf', File.dirname(__FILE__))
 	rack_conf = File.expand_path('../fixtures/tdiary.conf.rack', File.dirname(__FILE__))
 	work_data_dir = File.expand_path('../../tmp/data', File.dirname(__FILE__))