Skip to content

Commit

Permalink
Renaming visits to visit
Browse files Browse the repository at this point in the history
  • Loading branch information
brynary committed Nov 5, 2008
1 parent 0addcbe commit 72bcbca
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 14 deletions.
6 changes: 3 additions & 3 deletions lib/webrat/core/session.rb
Expand Up @@ -137,12 +137,12 @@ def within(selector)
# load was successful.
#
# Example:
# visits "/"
def visits(url = nil, http_method = :get, data = {})
# visit "/"
def visit(url = nil, http_method = :get, data = {})
request_page(url, http_method, data)
end

alias_method :visit, :visits
alias_method :visits, :visit

def open_in_browser(path) # :nodoc
`open #{path}`
Expand Down
4 changes: 2 additions & 2 deletions lib/webrat/selenium/selenium_session.rb
Expand Up @@ -7,11 +7,11 @@ def initialize(selenium_driver)
define_location_strategies
end

def visits(url)
def visit(url)
@selenium.open(url)
end

alias_method :visit, :visits
alias_method :visits, :visit

def fill_in(field_identifier, options)
locator = "webrat=#{Regexp.escape(field_identifier)}"
Expand Down
4 changes: 2 additions & 2 deletions spec/api/basic_auth_spec.rb
Expand Up @@ -6,9 +6,9 @@
@session.basic_auth('user', 'secret')
end

it "should be present in visits" do
it "should be present in visit" do
@session.should_receive(:get).with("/", {}, {'HTTP_AUTHORIZATION' => "Basic dXNlcjpzZWNyZXQ=\n"})
@session.visits("/")
@session.visit("/")
end

it "should be present in form submits" do
Expand Down
2 changes: 1 addition & 1 deletion spec/api/reloads_spec.rb
Expand Up @@ -9,7 +9,7 @@
it "should reload the page with http referer" do
@session.should_receive(:get).with("/", {})
@session.should_receive(:get).with("/", {}, {"HTTP_REFERER"=>"/"})
@session.visits("/")
@session.visit("/")
@session.reloads
end
end
12 changes: 6 additions & 6 deletions spec/api/visits_spec.rb → spec/api/visit_spec.rb
@@ -1,25 +1,25 @@
require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")

describe "visits" do
describe "visit" do
before do
@session = Webrat::TestSession.new
@session.response_body = "Hello world"
end

it "should use get" do
@session.should_receive(:get).with("/", {})
@session.visits("/")
@session.visit("/")
end

it "should assert valid response" do
@session.response_code = 501
lambda { @session.visits("/") }.should raise_error
lambda { @session.visit("/") }.should raise_error
end

[200, 300, 400, 499].each do |status|
it "should consider the #{status} status code as success" do
@session.response_code = status
lambda { @session.visits("/") }.should_not raise_error
lambda { @session.visit("/") }.should_not raise_error
end
end

Expand All @@ -28,7 +28,7 @@
end
end

describe "visits with referer" do
describe "visit with referer" do
before do
@session = Webrat::TestSession.new
@session.instance_variable_set(:@current_url, "/old_url")
Expand All @@ -37,7 +37,7 @@

it "should use get with referer header" do
@session.should_receive(:get).with("/", {}, {"HTTP_REFERER" => "/old_url"})
@session.visits("/")
@session.visit("/")
end

end

0 comments on commit 72bcbca

Please sign in to comment.