fixes conflicts

2015-10-09 17:37:45 +02:00
parent 96633327b5 d5c7ce530c
commit 22c6b7fad0
52 changed files with 988 additions and 61 deletions
--- a/spec/support/common_actions.rb
+++ b/spec/support/common_actions.rb
@@ -14,6 +14,10 @@ module CommonActions
    click_button 'Sign up'
  end

+  def login_as_manager(manager)
+    visit management_sign_in_path(login: manager.username, clave_usuario: manager.password)
+  end
+
  def login_through_form_as(user)
    visit root_path
    click_link 'Log in'