Making forward_trash_archive feature work

3 files changed, 30 insertions, 4 deletions

diff --git a/service/test/functional/features/forward_trash_archive.feature b/service/test/functional/features/forward_trash_archive.feature
index 7e70a7a9..91e078ea 100644
--- a/service/test/functional/features/forward_trash_archive.feature
+++ b/service/test/functional/features/forward_trash_archive.feature
@@ -16,13 +16,15 @@
 
 Feature: forward_trash_archive
 
-  @wip
   Scenario: User forwards a mail, add CC and BCC address, later trash the mail
+    Given I have a mail in my inbox
     When I open the first mail in the 'inbox'
     Then I choose to forward this mail
-    And for the 'CC' field I type 'ab' and chose the first contact that shows
-    And for the 'Bcc' field I type 'fr' and chose the first contact that shows
-    And I forward this mail
+    # And for the 'CC' field I type 'ab' and chose the first contact that shows
+    # And for the 'Bcc' field I type 'fr' and chose the first contact that shows
+    Given for the 'CC' field I enter 'pixelated@friends.org'
+    And for the 'Bcc' field I enter 'pixelated@family.org'
+    Then I forward this mail
     When I open the first mail in the 'sent'
     Then I see the mail has a cc and a bcc recipient
     And I choose to trash
diff --git a/service/test/functional/features/steps/data_setup.py b/service/test/functional/features/steps/data_setup.py
new file mode 100644
index 00000000..2064cb4f
--- /dev/null
+++ b/service/test/functional/features/steps/data_setup.py
@@ -0,0 +1,23 @@
+#
+# Copyright (c) 2014 ThoughtWorks, Inc.
+#
+# Pixelated is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Pixelated is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
+from behave import *
+from test.support.integration_helper import MailBuilder
+
+
+@given('I have a mail in my inbox')
+def add_mail_impl(context):
+    mail = MailBuilder().build_input_mail()
+    context.mailboxes.inbox().add(mail)
\ No newline at end of file
diff --git a/service/test/functional/features/steps/mail_view.py b/service/test/functional/features/steps/mail_view.py
index 98647958..2b0f1abb 100644
--- a/service/test/functional/features/steps/mail_view.py
+++ b/service/test/functional/features/steps/mail_view.py
@@ -80,6 +80,7 @@ def impl(context):
 
 @then('I forward this mail')
 def impl(context):
+    context.execute_steps(u'Given I save the draft')  # FIXME: this won't be necessary after #89 is done
     wait_until_button_is_visible(context, 'Send')
     click_button(context, 'Send')