1 files changed, 26 insertions, 4 deletions
diff --git a/service/test/functional/features/steps/login.py b/service/test/functional/features/steps/login.py
index 2d7be259..0ac27c46 100644
--- a/service/test/functional/features/steps/login.py
+++ b/service/test/functional/features/steps/login.py
@@ -21,16 +21,29 @@ from common import (
     find_element_by_css_selector)
 
 
+@given('I am logged in Pixelated')
+def login_user(context):
+    login_page(context)
+    enter_credentials(context)
+    click_login(context)
+    see_interstitial(context)
+    _see_inbox(context)
+
+
 @given(u'a user is accessing the login page')
 @when(u'I open the login page')
 def login_page(context):
     context.browser.get(context.login_url)
 
 
-@when(u'I enter {username} and {password} as credentials')
-def enter_credentials(context, username, password):
+def _see_inbox(context):
+    find_element_by_css_selector(context, '#compose', timeout=40)
+
+
+@when(u'I enter username and password as credentials')
+def enter_credentials(context):
     fill_by_css_selector(context, 'input[name="username"]', context.username)
-    fill_by_css_selector(context, 'input[name="password"]', password)
+    fill_by_css_selector(context, 'input[name="password"]', 'password')
 
 
 @when(u'I click on the login button')
@@ -39,20 +52,29 @@ def click_login(context):
 
 
 @then(u'I should see the fancy interstitial')
-def step_impl(context):
+def see_interstitial(context):
     find_element_by_css_selector(context, 'section#hive-section')
 
 
+@then(u'I should see the inbox')
+def see_inbox(context):
+    _see_inbox(context)
+
+
+@then(u'I logout')
 @when(u'I logout')
 def click_logout(context):
+    context.browser.refresh()
     find_element_by_css_selector(context, '#logout-form div').click()
 
 
+@then(u'I logout from the header')  # noqa
 @when(u'I logout from the header')
 def click_logout(context):
     find_element_by_css_selector(context, 'button[name="logout"]').click()
 
 
+@when(u'I should see the login page')
 @then(u'I should see the login page')
 def see_login_page(context):
     find_element_by_css_selector(context, 'form#login_form')