make integration spec work with javascript driver too

2013-07-24 02:57:45 +02:00 · 2013-07-24 02:57:45 +02:00 · 0d33922ed9
commit 0d33922ed9
parent a858ceedea
4 changed files with 33 additions and 2 deletions
--- a/spec/support/session_helper.rb
+++ b/spec/support/session_helper.rb
@ -4,7 +4,11 @@ module SessionHelper
  def login(user=nil, password=nil)
    visit login_path
    user = FactoryGirl.create :user if user.nil?
-    nick, password = user.nick, user.password if user.instance_of? ::User
+    if user.instance_of? ::User
+      nick, password = user.nick, user.password
+    else
+      nick = user
+    end
    fill_in 'nick', :with => nick
    fill_in 'password', :with => password
    find('input[type=submit]').click