Merge branch '1680-sign-up-form' into rails-3-develop

1 files changed, 9 insertions, 8 deletions

diff --git a/spec/integration/alaveteli_dsl.rb b/spec/integration/alaveteli_dsl.rb
index 1d56abbdf..b408bc4c6 100644
--- a/spec/integration/alaveteli_dsl.rb
+++ b/spec/integration/alaveteli_dsl.rb
@@ -33,15 +33,16 @@ def login(user)
     sess.reset!
     sess.extend(AlaveteliDsl)
 
-    if user.is_a? User
-        u = user
-    else
-        u = users(user)
-    end
+    u = user.is_a?(User) ? user : users(user)
+
     sess.visit signin_path
-    sess.fill_in "Your e-mail:", :with => u.email
-    sess.fill_in "Password:", :with => "jonespassword"
-    sess.click_button "Sign in"
+
+    sess.within '#signin_form' do
+        sess.fill_in "Your e-mail:", :with => u.email
+        sess.fill_in "Password:", :with => "jonespassword"
+        sess.click_button "Sign in"
+    end
+
     assert sess.session[:user_id] == u.id
   end
 end