Merge lp:~elopio/ubuntuone-testing/notes into lp:~rmcbride/ubuntuone-testing/webnotesautomation

[Leo Arias]

Finished the missing details of notes tests.

Finished the missing details of notes tests.

[Leo Arias (elopio)]

Rick, feel free to change whatever you want, these are your tests.

[Rick McBride (rmcbride)]

Thanks! fixes the missing issues and changes what was there to make more sense in context of our current tests.

review: Approve

=== removed directory 'ubuntuone/web/tests/sst/notes/additional'
=== removed file 'ubuntuone/web/tests/sst/notes/additional/__init__.py'
=== removed file 'ubuntuone/web/tests/sst/notes/additional/_actions.py'
--- ubuntuone/web/tests/sst/notes/additional/_actions.py	2011-09-27 18:10:08 +0000
+++ ubuntuone/web/tests/sst/notes/additional/_actions.py	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-from sst.actions import *
-from config import base_url
-
-set_base_url(base_url)
-set_wait_timeout(40)
-
-
-def wait_for_title_to_change(title):
-    waitfor(title_is, title)
-
-def login(username, password):
-    goto('/auth/login')
-    wait_for_title_to_change('Log in')
-    is_textfield('id_email')
-    is_textfield('id_password')
-    textfield_write('id_email', username)
-    textfield_write('id_password', password)
-    button_click(get_element(css_class='btn', name='continue'))
-    button_click(get_element(css_class='btn', name='yes'))

=== removed file 'ubuntuone/web/tests/sst/notes/additional/config.py'
--- ubuntuone/web/tests/sst/notes/additional/config.py	2011-09-27 18:10:08 +0000
+++ ubuntuone/web/tests/sst/notes/additional/config.py	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-# set below according to need (staging v production v test instance)
-base_url = 'https://staging.one.ubuntu.com/'

=== modified file 'ubuntuone/web/tests/sst/notes/u1webnotes001_create.py'
--- ubuntuone/web/tests/sst/notes/u1webnotes001_create.py	2011-10-27 18:37:05 +0000
+++ ubuntuone/web/tests/sst/notes/u1webnotes001_create.py	2011-11-17 02:22:23 +0000
@@ -17,15 +17,16 @@
 """Test Case u1webnotes_001: Add a note through the WebUI.
 """
 
-from sst.actions import *
-from additional._actions import *
+import uuid
 import actions.setup as setup_actions
 import actions.notes as notes_actions
 
-name = 'This is a test note'
-body = 'there are many like it, but this one is mine'
+note_uuid = uuid.uuid1()
+title = 'Test note %s' % note_uuid
+body = 'Body of test note %s' % note_uuid
+
 setup_actions.setup()
 notes_actions.open()
-exists_element(css_class='add-button', text='Add note')
-notes_actions.add_note(name, body)
-notes_actions.assert_note_exists(name)
+notes_actions.add_note(title, body)
+notes_actions.assert_note_exists(title)
+notes_actions.assert_note(title, body)

=== modified file 'ubuntuone/web/tests/sst/notes/u1webnotes002_edit.py'
--- ubuntuone/web/tests/sst/notes/u1webnotes002_edit.py	2011-10-27 18:40:24 +0000
+++ ubuntuone/web/tests/sst/notes/u1webnotes002_edit.py	2011-11-17 02:22:23 +0000
@@ -18,22 +18,24 @@
 it.
 """
 
-from sst.actions import *
-from additional._actions import *
+import uuid
 import actions.setup as setup_actions
 import actions.notes as notes_actions
-
-name = 'This is another test note'
-body = 'there are many like it, but this one is mine'
-edited_name = 'This is an edited test note'
-edited_body = 'there are many like it, and as it turns out mine is not all \
-    that unique.'
+from sst.actions import *
+
+note_uuid = uuid.uuid1()
+title = 'Test note %s' % note_uuid
+body = 'Body of test note %s' % note_uuid
+edited_title = 'edited ' + title
+edited_body = 'edited ' + body
+
 setup_actions.setup()
 notes_actions.open()
-exists_element(css_class='add-button', text='Add note')
-notes_actions.add_note(name, body)
-notes_actions.assert_note_exists(name)
-"""Edit a note in the WebUI."""
-notes_actions.select_note('This is a test note')
-notes_actions.edit_note(edited_name, edited_body)
-notes_actions.assert_note_exists(edited_name)
+notes_actions.add_note(title, body)
+notes_actions.assert_note_exists(title)
+notes_actions.select_note(title)
+notes_actions.edit_note(edited_title, edited_body)
+fails(notes_actions.assert_note_exists, title)
+notes_actions.assert_note_exists(edited_title)
+notes_actions.assert_note(edited_title, edited_body)
+

=== modified file 'ubuntuone/web/tests/sst/notes/u1webnotes003_delete.py'
--- ubuntuone/web/tests/sst/notes/u1webnotes003_delete.py	2011-10-26 20:10:37 +0000
+++ ubuntuone/web/tests/sst/notes/u1webnotes003_delete.py	2011-11-17 02:22:23 +0000
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+
+# Copyright 2011 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Test Case u1webnotes_003: Delete a note through the WebUI.
+"""
+
+import uuid
+import actions.setup as setup_actions
+import actions.notes as notes_actions
+
+note_uuid = uuid.uuid1()
+title = 'Test note %s' % note_uuid
+body = 'Body of test note %s' % note_uuid
+
+setup_actions.setup()
+notes_actions.open()
+notes_actions.add_note(title, body)
+notes_actions.assert_note_exists(title)
+notes_actions.assert_note(title, body)
+notes_actions.delete_note(title)
+notes_actions.assert_note_was_deleted(title)

=== modified file 'ubuntuone/web/tests/sst/shared/actions/notes.py'
--- ubuntuone/web/tests/sst/shared/actions/notes.py	2011-10-27 18:37:05 +0000
+++ ubuntuone/web/tests/sst/shared/actions/notes.py	2011-11-17 02:22:23 +0000
@@ -18,14 +18,20 @@
 
 from sst.actions import *
 from loading import *
+from selenium.webdriver.common import keys
 
 
 def open():
     """Open the notes page and check its title with an assert."""
-    goto('/notes/')
+    link_click(_get_notes_link(), wait=False)
+    switch_to_window()
     assert_title()
 
 
+def _get_notes_link():
+    return get_element_by_css('#main-nav .notes')
+
+
 def assert_title():
     """Assert that the title of the page is the expected."""
     title_is(u'Ubuntu One : Notes')
@@ -36,49 +42,88 @@
 
 
 def select_note(title):
-    button_click(get_elements(tag='li', text=title))
-
-
-def add_note(note, note_body):
+    link_click(_get_note_link(title))
+    wait_for_action_to_complete()
+    
+
+def _get_note_link(title):
+    return get_element(tag='a', css_class='note_link', text=title)
+
+
+def assert_note(title, body):
+    if title:
+        displayed_title = _get_note_title()
+        assert displayed_title == title, \
+               'Title is %(displayed)s, but it should be %(expected)s.' % \
+               {'displayed':displayed_title, 'expected':title}
+    if body:
+        displayed_body = _get_note_body()
+        assert displayed_body == body, \
+               'Body is %(displayed)s, but it should be %(expected)s.' % \
+               {'displayed':displayed_body, 'expected':body}
+
+
+def _get_note_title():
+    return get_element_by_css('#notes-main > h1').text
+
+
+def _get_note_body():
+    return get_element_by_css('#notes-main > .note-view').text
+
+
+def add_note(title, body):
     """Click the button to add note."""
-    link_add = get_elements(css_class='add-button', text='Add note')[0]
+    _click_add_note()
+    _fill(title, body)
+    _save()
+
+
+def _click_add_note():
+    link_add = get_element(css_class='add-button')
     link_click(link_add)
     wait_for_action_to_complete()
-    edit_title(note)
-    edit_body(note_body)
-    link_save = get_elements(css_class='save-button', text='Save')[0]
+
+
+def _fill(title, body):
+    if title:
+        textfield_write('id_title', title)
+    if body:
+        switch_to_frame('id_body_editor')
+        body_element = get_element(tag='body')
+        body_element.send_keys(keys.Keys().CONTROL, 'a')
+        body_element.send_keys(keys.Keys().DELETE)
+        body_element.send_keys(body)
+        switch_to_frame()
+
+
+def _save():
+    link_save = get_elements(css_class='save-button')[0]
     element_click(link_save)
     wait_for_action_to_complete()
 
 
-def edit_note(edited_note, edited_note_body):
+def edit_note(edited_title, edited_body):
     """Click the button to edit note."""
-    link_edit = get_elements(css_class='edit-button', text='Edit note')[0]
+    _click_edit_note()
+    _fill(edited_title, edited_body)
+    _save()
+
+
+def _click_edit_note():
+    link_edit = get_elements(css_class='edit-button')[0]
     link_click(link_edit)
     wait_for_action_to_complete()
-    edit_title(edited_note)
-    edit_body(edited_note_body)
-    link_save = get_elements(css_class='save-button', text='Save')[0]
-    element_click(link_save)
-    wait_for_action_to_complete()
-
-
-def delete_note(deleted_note):
+
+
+def delete_note(title):
     """Delete the note"""
-    note_identifier = get_note_identifier()
-    element_note = _get_element_note_identifier(note_identifier)
-    #somehow select based on identifier. no checkbox in this UI like for
-    #contacts
-    #this is a guess
-    link_click(get_elements(li_class='selected', a_class='delete-button'))
+    select_note(title)
+    delete_button = get_element_by_css('li.selected > a.delete-button')
+    element_click(delete_button)
+    alert_accept()
     wait_for_action_to_complete()
 
 
-def edit_title(title):
-    """Enter the text in the title field."""
-    textfield_write('id_title', title)
-
-
-def edit_body(body):
-    """Enter the body texst in the body field."""
-    textfield_write('id_body_editor', body)
+def assert_note_was_deleted(title):
+    fails(assert_note_exists, title)
+    text_is('notes-main', '"%s" has been deleted' % title)