Permalink
Browse files

Add current_path to dsl

  • Loading branch information...
1 parent 8ff36c4 commit db16a190734e62cec455afcca705c977db00529d Paul Elliott committed Apr 7, 2010
View
4 README.rdoc
@@ -141,6 +141,10 @@ You can use the <tt>visit</tt> method to navigate to other pages:
The visit method only takes a single parameter, the request method is *always*
GET.
+You can get the current path of the browsing session for test assertions:
+
+ current_path.should == post_comments_path(post)
+
=== Clicking links and buttons
You can interact with the webapp by following links and buttons. Capybara
View
4 lib/capybara/driver/base.rb
@@ -3,6 +3,10 @@ def current_url
raise NotImplementedError
end
+ def current_path
+ URI.parse(current_url).path
+ end
+
def visit(path)
raise NotImplementedError
end
View
6 lib/capybara/driver/rack_test_driver.rb
@@ -191,7 +191,7 @@ def visit(path, attributes = {})
end
def process(method, path, attributes = {})
- return if path.gsub(/^#{current_path}/, '') =~ /^#/
+ return if path.gsub(/^#{request_path}/, '') =~ /^#/
send(method, path, attributes, env)
follow_redirects!
end
@@ -205,7 +205,7 @@ def response_headers
end
def submit(method, path, attributes)
- path = current_path if not path or path.empty?
+ path = request_path if not path or path.empty?
send(method, path, attributes, env)
follow_redirects!
end
@@ -239,7 +239,7 @@ def build_rack_mock_session # :nodoc:
Rack::MockSession.new(app, Capybara.default_host || "www.example.com")
end
- def current_path
+ def request_path
request.path rescue ""
end
View
3 lib/capybara/session.rb
@@ -12,7 +12,7 @@ class Session
:has_no_content?, :has_no_css?, :has_no_xpath?, :has_xpath?, :locate, :save_and_open_page, :select, :source, :uncheck,
:visit, :wait_until, :within, :within_fieldset, :within_table, :within_frame, :has_link?, :has_no_link?, :has_button?,
:has_no_button?, :has_field?, :has_no_field?, :has_checked_field?, :has_unchecked_field?, :has_no_table?, :has_table?,
- :unselect, :has_select?, :has_no_select?
+ :unselect, :has_select?, :has_no_select?, :current_path
]
attr_reader :mode, :app
@@ -34,6 +34,7 @@ def driver
def_delegator :driver, :cleanup!
def_delegator :driver, :current_url
+ def_delegator :driver, :current_path
def_delegator :driver, :response_headers
def_delegator :driver, :visit
def_delegator :driver, :body
View
5 lib/capybara/spec/driver.rb
@@ -18,6 +18,11 @@
@driver.visit('/foo')
@driver.current_url.should include('/foo')
end
+
+ it 'should show the correct location' do
+ @driver.visit('/foo')
+ @driver.current_path.should == '/foo'
+ end
end
describe '#body' do

0 comments on commit db16a19

Please sign in to comment.