Skip to content

Commit

Permalink
Streamline default_selector
Browse files Browse the repository at this point in the history
  • Loading branch information
jnicklas committed Nov 26, 2009
1 parent b082316 commit d3a11f0
Show file tree
Hide file tree
Showing 4 changed files with 186 additions and 201 deletions.
10 changes: 1 addition & 9 deletions lib/capybara/dsl.rb
@@ -1,7 +1,6 @@
module Capybara
class << self
attr_writer :default_driver, :current_driver, :javascript_driver
attr_reader :default_selector

attr_accessor :app

Expand All @@ -24,9 +23,7 @@ def use_default_driver

def current_session
session_pool["#{current_driver}#{app.object_id}"] ||= begin
session = Capybara::Session.new(current_driver, app)
session.default_selector = default_selector if default_selector
session
Capybara::Session.new(current_driver, app)
end
end

Expand All @@ -37,11 +34,6 @@ def current_session?
def reset_sessions!
@session_pool = nil
end

def default_selector=(selector)
@default_selector = selector
current_session.default_selector = selector if current_session?
end

private

Expand Down

0 comments on commit d3a11f0

Please sign in to comment.