kotovalexarian-likes-github
/
capybara-webkit
mirror of https://github.com/thoughtbot/capybara-webkit
1
0
Fork 0
Code Releases Activity

Don't start queued commands more than once 

TimeoutCommand may receive pageFinished multiple times before
PageLoadingCommand has finished.
This commit is contained in:
Matthew Horan 2012-12-18 22:46:24 -05:00
parent 96e79e4a2f
commit bca84f9a57
2 changed files with 47 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
spec/integration/session_spec.rb
View File

@ -182,4 +182,50 @@ describe Capybara::Session do
end
end
end
context "session app" do
before do
@app = Class.new(ExampleApp) do
enable :sessions
get '/' do
<<-HTML
<html>
<body>
<form method="post" action="/sign_in">
<input type="text" name="username">
<input type="password" name="password">
<input type="submit" value="Submit">
</form>
</body>
</html>
HTML
end
post '/sign_in' do
session[:username] = params[:username]
session[:password] = params[:password]
redirect '/'
end
get '/other' do
<<-HTML
<html>
<body>
<p>Welcome, #{session[:username]}.</p>
</body>
</html>
HTML
end
end
end
it "should not start queued commands more than once" do
subject.visit('/')
subject.fill_in('username', with: 'admin')
subject.fill_in('password', with: 'temp4now')
subject.click_button('Submit')
subject.visit('/other')
subject.should have_content('admin')
end
end
end

3
src/TimeoutCommand.cpp
View File

@ -39,12 +39,12 @@ void TimeoutCommand::startTimeout() {
}
void TimeoutCommand::pendingLoadFinished(bool success) {
disconnect(m_manager, SIGNAL(pageFinished(bool)), this, SLOT(pendingLoadFinished(bool)));
if (success) {
startCommand();
} else {
disconnect(m_timer, SIGNAL(timeout()), this, SLOT(commandTimeout()));
disconnect(m_manager, SIGNAL(loadStarted()), this, SLOT(pageLoadingFromCommand()));
disconnect(m_manager, SIGNAL(pageFinished(bool)), this, SLOT(pendingLoadFinished(bool)));
emitFinished(false, m_manager->currentPage()->failureString());
}
}
@ -64,7 +64,6 @@ void TimeoutCommand::commandTimeout() {
void TimeoutCommand::commandFinished(Response *response) {
disconnect(m_timer, SIGNAL(timeout()), this, SLOT(commandTimeout()));
disconnect(m_manager, SIGNAL(loadStarted()), this, SLOT(pageLoadingFromCommand()));
disconnect(m_manager, SIGNAL(pageFinished(bool)), this, SLOT(pendingLoadFinished(bool)));
emit finished(response);
}