summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--service/test/functional/features/attachments.feature8
-rw-r--r--service/test/functional/features/files/image_over_1MB.pngbin1094522 -> 0 bytes
-rw-r--r--service/test/functional/features/steps/attachments.py31
3 files changed, 3 insertions, 36 deletions
diff --git a/service/test/functional/features/attachments.feature b/service/test/functional/features/attachments.feature
index 5cdbf7be..859ee590 100644
--- a/service/test/functional/features/attachments.feature
+++ b/service/test/functional/features/attachments.feature
@@ -32,12 +32,8 @@ Feature: Attachments
| Pixelated rocks! | You should definitely use it. Cheers, User. |
And for the 'To' field I enter 'pixelated@friends.org'
And I find an attachment icon
- When I try to upload a file bigger than 1MB
- Then I see an upload error message
- When I dismiss the error message
- Then It should not show the error message anymore
- When I upload a valid file
+ When I upload a file
And I send it
When I select the tag 'sent'
And I open the first mail in the mail list
- Then I see the mail has an attachment
+ Then I see the mail has an attachment \ No newline at end of file
diff --git a/service/test/functional/features/files/image_over_1MB.png b/service/test/functional/features/files/image_over_1MB.png
deleted file mode 100644
index 874eac0a..00000000
--- a/service/test/functional/features/files/image_over_1MB.png
+++ /dev/null
Binary files differ
diff --git a/service/test/functional/features/steps/attachments.py b/service/test/functional/features/steps/attachments.py
index b0c7c791..8dc4e244 100644
--- a/service/test/functional/features/steps/attachments.py
+++ b/service/test/functional/features/steps/attachments.py
@@ -60,36 +60,7 @@ def find_icon(context):
assert find_element_by_css_selector(context, '#attachment-button .fa.fa-paperclip')
-@when(u'I try to upload a file bigger than 1MB')
-def upload_big_file(context):
- base_dir = "test/functional/features/files/"
- fname = "image_over_1MB.png"
- fill_by_css_selector(context, '#fileupload', base_dir + fname)
- wait_until_element_is_visible_by_locator(context, (By.CSS_SELECTOR, '#upload-error-message'))
-
-
-@then(u'I see an upload error message')
-def show_upload_error_message(context):
- upload_error_message = find_elements_by_css_selector(context, '#upload-error-message')
- error_messages = [e.text for e in upload_error_message]
- assert "Upload failed. This file exceeds the 1MB limit." in error_messages
-
-
-@when(u'I dismiss the error message')
-def dismiss_error_message(context):
- dismiss_button = find_elements_by_css_selector(context, '#dismiss-button')
- assert len(dismiss_button) > 0
- for button in dismiss_button:
- button.click()
-
-
-@then(u'It should not show the error message anymore')
-def should_not_show_upload_error_message(context):
- upload_error_message_is_present = page_has_css(context, '#upload-error-message')
- assert not upload_error_message_is_present
-
-
-@when(u'I upload a valid file')
+@when(u'I upload a file')
def upload_attachment(context):
base_dir = "test/functional/features/files/"
fname = "upload_test_file.txt"