Don't start queued commands more than once

TimeoutCommand may receive pageFinished multiple times before PageLoadingCommand has finished.
thoughtbot · Dec 19, 2012 · bca84f9 · bca84f9 · seangeo · Dec 19, 2012
1 parent 96e79e4
commit bca84f9
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 2 deletions.
diff --git a/spec/integration/session_spec.rb b/spec/integration/session_spec.rb
@@ -182,4 +182,50 @@ module TestSessions
       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
diff --git a/src/TimeoutCommand.cpp b/src/TimeoutCommand.cpp
@@ -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);
 }