Skip to content
This repository has been archived by the owner on Mar 3, 2020. It is now read-only.

Commit

Permalink
Capybara spec_helper is in capybara/spec
Browse files Browse the repository at this point in the history
  • Loading branch information
mhoran committed Feb 17, 2013
1 parent d79a6ba commit 15bb560
Showing 1 changed file with 1 addition and 9 deletions.
10 changes: 1 addition & 9 deletions spec/spec_helper.rb
Expand Up @@ -9,14 +9,6 @@

Dir[File.join(PROJECT_ROOT, 'spec', 'support', '**', '*.rb')].each { |file| require(file) }

spec_dir = nil
$:.detect do |dir|
if File.exists? File.join(dir, "capybara.rb")
spec_dir = File.expand_path(File.join(dir,"..","spec"))
$:.unshift( spec_dir )
end
end

require 'capybara/webkit'
connection = Capybara::Webkit::Connection.new(:socket_class => TCPSocket)
$webkit_browser = Capybara::Webkit::Browser.new(connection)
Expand All @@ -25,7 +17,7 @@
$webkit_browser.enable_logging
end

require File.join(spec_dir, "spec_helper")
require 'capybara/spec/spec_helper'

Capybara.register_driver :reusable_webkit do |app|
Capybara::Webkit::Driver.new(app, :browser => $webkit_browser)
Expand Down

0 comments on commit 15bb560

Please sign in to comment.