Skip to content
Browse files

Merge pull request #897 from kou/suppress-warnings

Suppress warnings
  • Loading branch information...
2 parents 86e86c2 + cb8543f commit 67a78f4d442e868fe88a8fea64ad4d71c83e8ae8 @joliss joliss committed Dec 2, 2012
Showing with 7 additions and 2 deletions.
  1. +1 −0 lib/capybara/node/base.rb
  2. +1 −0 lib/capybara/selector.rb
  3. +3 −0 lib/capybara/session.rb
  4. +2 −2 lib/capybara/spec/spec_helper.rb
View
1 lib/capybara/node/base.rb
@@ -31,6 +31,7 @@ class Base
def initialize(session, base)
@session = session
@base = base
+ @unsynchronized = false
end
# overridden in subclasses, e.g. Capybara::Node::Element
View
1 lib/capybara/selector.rb
@@ -21,6 +21,7 @@ def initialize(name, &block)
@name = name
@custom_filters = {}
@match = nil
+ @label = nil
@failure_message = nil
instance_eval(&block)
end
View
3 lib/capybara/session.rb
@@ -51,7 +51,10 @@ def initialize(mode, app=nil)
@app = app
if Capybara.run_server and @app and driver.needs_server?
@server = Capybara::Server.new(@app).boot
+ else
+ @server = nil
end
+ @touched = false
end
def driver
View
4 lib/capybara/spec/spec_helper.rb
@@ -46,8 +46,8 @@ def run_specs(session, name, options={})
after do
@session.reset_session!
end
- specs.each do |name, options, block|
- describe name, options do
+ specs.each do |spec_name, spec_options, block|
+ describe spec_name, spec_options do
class_eval(&block)
end
end

0 comments on commit 67a78f4

Please sign in to comment.
Something went wrong with that request. Please try again.