summaryrefslogtreecommitdiff
path: root/service
diff options
context:
space:
mode:
authorRafael Lisboa <rafaelzlisboa@gmail.com>2015-04-14 16:13:49 -0300
committerRafael Lisboa <rafaelzlisboa@gmail.com>2015-04-14 16:13:49 -0300
commitf4aa7e41b343704843002ffc8a85c58abf09b911 (patch)
tree3a8b54edf62fadcb322d0f5cabeecde2c83f3067 /service
parent2ec6d6260c8fcc66446d3e600b70dd0043109744 (diff)
parent8d2869fa1fa2018772d4f310c4ba9b9c9373a667 (diff)
Merge pull request #376 from pixelated-project/mail-item-refactor
Mail item refactor
Diffstat (limited to 'service')
-rw-r--r--service/test/functional/features/forward_trash_archive.feature2
-rw-r--r--service/test/functional/features/steps/tag_list.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/service/test/functional/features/forward_trash_archive.feature b/service/test/functional/features/forward_trash_archive.feature
index 6e959c32..1d373b88 100644
--- a/service/test/functional/features/forward_trash_archive.feature
+++ b/service/test/functional/features/forward_trash_archive.feature
@@ -31,4 +31,4 @@ Feature: forward and deletion
When I choose to trash
# Then I see that mail under the 'trash' tag
When I select the tag 'trash'
- And I open the first mail in the mail list \ No newline at end of file
+ And I open the first mail in the mail list
diff --git a/service/test/functional/features/steps/tag_list.py b/service/test/functional/features/steps/tag_list.py
index b3e09c22..443c5173 100644
--- a/service/test/functional/features/steps/tag_list.py
+++ b/service/test/functional/features/steps/tag_list.py
@@ -21,13 +21,13 @@ def click_first_element_with_class(context, classname):
elements[0].click()
-def is_side_nax_expanded(context):
+def is_side_nav_expanded(context):
e = context.browser.find_elements_by_class_name('content')[0].get_attribute('class').count(u'move-right') == 1
return e
def expand_side_nav(context):
- if is_side_nax_expanded(context):
+ if is_side_nav_expanded(context):
return
toggle = context.browser.find_elements_by_class_name('side-nav-toggle')[0]