diff options
| author | Jon Newson <jon_newson@ieee.org> | 2016-03-15 18:07:42 +1100 |
|---|---|---|
| committer | Jon Newson <jon_newson@ieee.org> | 2016-03-15 18:07:42 +1100 |
| commit | a455353a811d4cf3a9c327750e9d0fb4c7ee229a (patch) | |
| tree | 0c42f4a153df882d49b0448209ab0a1937e13685 /service/test/functional/features/steps/mail_view.py | |
| parent | 0ffeb6b70df00a54a2509179c32104bc7f883196 (diff) | |
| parent | cf32471caf75b817b23339166002987726d3d6d8 (diff) | |
Merge branch 'master' of https://github.com/pixelated/pixelated-user-agent
# By Felix Hammerl (13) and Thais Siqueira (3)
# Via Christoph (1) and Thais Siqueira (1)
* 'master' of https://github.com/pixelated/pixelated-user-agent:
Sets SSL certifications to false.
Fixes pep8 errors and update requests to 2.9.1.
Update locust test to run after xsrf token implementation.
Issue #620: Adapt unit tests to CSS changes
Issue #620: Refactor palceholder
Issue #620: Remove former main css file
Issue #620: Spike growl CSS modularization
Issue #617: Highlight search terms by altering mail content
Issue #617: Allow only >=3 alphanumeric characters in search field
Issue #617: Restrict searching to alphanumeric characters
Issue #617: Remove highlighting for sandboxed content
Issue #617: Add sandbox to build scripts
Issue #617: Add sandbox to user-agent
Issue #617: Create sandbox resouces
Issue #617: Add iframe-resizer
Issue #617: Serve content from Sandbox resource
Diffstat (limited to 'service/test/functional/features/steps/mail_view.py')
| -rw-r--r-- | service/test/functional/features/steps/mail_view.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/service/test/functional/features/steps/mail_view.py b/service/test/functional/features/steps/mail_view.py index 82fc28af..c0e9e22b 100644 --- a/service/test/functional/features/steps/mail_view.py +++ b/service/test/functional/features/steps/mail_view.py @@ -25,8 +25,11 @@ def impl(context, subject): @then('I see that the body reads \'{expected_body}\'') def impl(context, expected_body): - e = find_element_by_css_selector(context, '#mail-view .bodyArea') + find_element_by_css_selector(context, '#read-sandbox') + context.browser.switch_to_frame('read-sandbox') + e = find_element_by_css_selector(context, 'body') assert e.text == expected_body + context.browser.switch_to_default_content() @then('that email has the \'{tag}\' tag') |