Merge lp:~elopio/ubuntuone-testing/fix-files-this-time-for-real into lp:ubuntuone-testing

[Leo Arias]

Fixes and additions to the files tests.

Fixes and additions to the files tests.

[Rick McBride (rmcbride)]

Neat!

review: Approve

=== modified file 'ubuntuone/web/tests/sst/files/u1webf001_uploadfile.py'
--- ubuntuone/web/tests/sst/files/u1webf001_uploadfile.py	2011-09-26 05:39:58 +0000
+++ ubuntuone/web/tests/sst/files/u1webf001_uploadfile.py	2011-11-04 23:08:23 +0000
@@ -26,15 +26,23 @@
 import actions.setup as setup_actions
 import actions.files as files_actions
 import os.path
+import tempfile
+import uuid
 
 setup_actions.setup()
 files_actions.open()
-file_name = 'Test_upload_from_website.txt'
-files_actions.upload_file(
-    os.path.abspath('test_files/' + file_name))
+file_uuid = str(uuid.uuid1())
+file_contents = 'This is test file %s' % file_uuid
+file_name = None
+with tempfile.NamedTemporaryFile(mode='wr', prefix='Test upload from website',
+                                 suffix=file_uuid + '.txt',
+                                 delete=False) as upload:
+    upload.write(file_contents)
+    upload.close()
+    files_actions.upload_file(upload.name)
+    file_name = os.path.basename(upload.name)
 files_actions.assert_file_exists(file_name)
 assert files_actions.get_file_upload_date(file_name) == 'Just now'
-assert files_actions.get_file_size(file_name) == '21 bytes'
-files_actions.click_file_more(file_name)
+assert files_actions.get_file_size(file_name) == '54 bytes'
 files_actions.assert_file_information_is_shown(file_name)
-files_actions.assert_file_type('text/plain')
+files_actions.assert_file_type(file_name, 'text/plain')

=== modified file 'ubuntuone/web/tests/sst/files/u1webf002_publishfile.py'
--- ubuntuone/web/tests/sst/files/u1webf002_publishfile.py	2011-10-03 08:50:46 +0000
+++ ubuntuone/web/tests/sst/files/u1webf002_publishfile.py	2011-11-04 23:08:23 +0000
@@ -26,11 +26,26 @@
 import actions.setup as setup_actions
 import actions.files as files_actions
 import os.path
+import tempfile
+import uuid
+import urlparse
 
 setup_actions.setup()
 files_actions.open()
-file_name = 'Test_publish_from_website.txt'
-files_actions.upload_file(
-    os.path.abspath('test_files/' + file_name))
+file_uuid = str(uuid.uuid1())
+file_contents = 'This is test file %s' % file_uuid
+file_name = None
+with tempfile.NamedTemporaryFile(mode='wr', prefix='Test publish from website',
+                                 suffix=file_uuid + '.txt',
+                                 delete=False) as upload:
+    upload.write(file_contents)
+    upload.close()
+    files_actions.upload_file(upload.name)
+    file_name = os.path.basename(upload.name)
 files_actions.publish_file(file_name)
-# TODO assert the publication.
+files_actions.assert_file_published(file_name)
+file_url = files_actions.get_public_url(file_name)
+parsed_url = urlparse.urlparse(file_url)
+set_base_url(file_url.rstrip(parsed_url.path))
+goto(parsed_url.path)
+text_is(get_element(tag='body'), file_contents)

=== modified file 'ubuntuone/web/tests/sst/files/u1webf003_stoppublishingfile.py'
--- ubuntuone/web/tests/sst/files/u1webf003_stoppublishingfile.py	2011-10-03 08:50:46 +0000
+++ ubuntuone/web/tests/sst/files/u1webf003_stoppublishingfile.py	2011-11-04 23:08:23 +0000
@@ -26,12 +26,29 @@
 import actions.setup as setup_actions
 import actions.files as files_actions
 import os.path
+import tempfile
+import uuid
+import urlparse
 
 setup_actions.setup()
 files_actions.open()
-file_name = 'Test_publish_from_website.txt'
-files_actions.upload_file(
-    os.path.abspath('test_files/' + file_name))
+file_uuid = str(uuid.uuid1())
+file_contents = 'This is test file %s' % file_uuid
+file_name = None
+with tempfile.NamedTemporaryFile(mode='wr',
+                                 prefix='Test stop publishing from website',
+                                 suffix=file_uuid + '.txt',
+                                 delete=False) as upload:
+    upload.write(file_contents)
+    upload.close()
+    files_actions.upload_file(upload.name)
+    file_name = os.path.basename(upload.name)
 files_actions.publish_file(file_name)
+files_actions.assert_file_published(file_name)
+file_url = files_actions.get_public_url(file_name)
 files_actions.stop_publishing_file(file_name)
-# TODO assert that the file is not published anymore.
+files_actions.assert_file_not_published(file_name)
+parsed_url = urlparse.urlparse(file_url)
+set_base_url(file_url.rstrip(parsed_url.path))
+goto(parsed_url.path)
+text_is(get_element(tag='body'), 'Could not locate object')

=== modified file 'ubuntuone/web/tests/sst/shared/actions/files.py'
--- ubuntuone/web/tests/sst/shared/actions/files.py	2011-11-03 17:56:44 +0000
+++ ubuntuone/web/tests/sst/shared/actions/files.py	2011-11-04 23:08:23 +0000
@@ -62,9 +62,8 @@
     input_file = _get_elem('upload-overlay-file')
     input_file.send_keys(path)
     button_click('upload-overlay-upload-button')
-    set_wait_timeout(180)
+    # TODO set a waiting time proportional to the size of the file to upload.
     wait_for_action_to_complete()
-    set_wait_timeout(DEFAULT_TIMEOUT)
 
 def assert_file_exists(name):
     """Assert that a file exists on the Ubuntu One storage.
@@ -147,7 +146,19 @@
     identifier -- The identifier of the file.
 
     """
-    return get_element('%s-publish' % identifier)
+    return get_element(id='%s-publish' % identifier,
+                       css_class='u1-files-publish-link')
+
+def _get_link_stop_publishing_file(identifier):
+    """Get the Stop Publish File link element.
+
+    Keyword arguments:
+    identifier -- The identifier of the file.
+
+    """
+    return get_element(id='%s-publish' % identifier,
+                       css_class='u1-files-stop-publishing-link')
+
 
 def _get_link_download_file(identifier):
     """Get the Download file link element.
@@ -157,9 +168,8 @@
 
     """
     # TODO the URL should be taken from the config.
-    return get_element(css_class='download-button',
-                       href='http://files.staging.one.ubuntu.com/%s'
-                       % identifier)
+    url = 'https://files.staging.one.ubuntu.com/' + str(identifier[3:])
+    return get_element(css_class='download-button', href=url)
 
 def _get_link_delete_file(identifier):
     """Get the Delete file link element.
@@ -180,8 +190,8 @@
     assert _are_details_shown(name)
     identifier = _get_file_identifier(name)
     assert _get_link_publish_file(identifier).is_displayed()
-    assert _get_link_download_file.is_displayed()
-    assert _get_link_delete_file.is_displayed()
+    assert _get_link_download_file(identifier).is_displayed()
+    assert _get_link_delete_file(identifier).is_displayed()
 
 def assert_file_type(name, type):
     """Assert that the type of a file is the expected.
@@ -206,9 +216,22 @@
     """
     show_file_details(name)
     identifier = _get_file_identifier(name)
-    link_click(_get_link_publish_file(identifier))
+    element_click(_get_link_publish_file(identifier))
     wait_for_action_to_complete()
 
+def assert_file_published(name):
+    """Assert that a folder is shared.
+    
+    Keyword arguments:
+    name -- The name of the published file.
+
+    """
+    show_file_details(name)
+    identifier = _get_file_identifier(name)
+    _get_link_stop_publishing_file(identifier)
+    fails(_get_link_publish_file, identifier)
+    get_public_url(name)
+
 def get_public_url(name):
     """Get the public URL of a published file.
 
@@ -218,8 +241,8 @@
     """
     show_file_details(name)
     # XXX this element requires an identifier.
-    input_public_url = get_elementby_xpath('id("%s-details")//'
-                                           'input[@class="public_url'
+    input_public_url = get_element_by_xpath('id("%s-details")//'
+                                           'input[@class="public_url"]'
                                            % _get_file_identifier(name))
     return input_public_url.get_attribute('value')
 
@@ -232,9 +255,23 @@
     """
     show_file_details(name)
     identifier = _get_file_identifier(name)
-    link_click(_get_link_publish_file(identifier))
+    element_click(_get_link_stop_publishing_file(identifier))
     wait_for_action_to_complete()
 
+def assert_file_not_published(name):
+    """Assert that a folder is shared.
+    
+    Keyword arguments:
+    name -- The name of the published file.
+
+    """
+    show_file_details(name)
+    identifier = _get_file_identifier(name)
+    fails(_get_link_stop_publishing_file, identifier)
+    _get_link_publish_file(identifier)
+    fails(get_public_url, name)
+
+
 def download_file(name):
     """Download a file stored on the Ubuntu One service.
 

=== modified file 'ubuntuone/web/tests/sst/shared/actions/setup.py'
--- ubuntuone/web/tests/sst/shared/actions/setup.py	2011-11-03 17:56:44 +0000
+++ ubuntuone/web/tests/sst/shared/actions/setup.py	2011-11-04 23:08:23 +0000
@@ -42,6 +42,9 @@
     """
     set_base_url(base_url)
     set_wait_timeout(DEFAULT_TIMEOUT)
+    goto()
+    wait_for_title_to_change('Ubuntu One : Home')
+    link_click(get_element(text='Log in or Sign up'))
     if new_user:
         skip('New user creation is not yet implemented.')
     else:

=== modified file 'ubuntuone/web/tests/sst/shared/actions/sso.py'
--- ubuntuone/web/tests/sst/shared/actions/sso.py	2011-10-06 05:31:32 +0000
+++ ubuntuone/web/tests/sst/shared/actions/sso.py	2011-11-04 23:08:23 +0000
@@ -31,12 +31,13 @@
     password -- The password of the user.
 
     """
-    goto('/auth/login')
     waitfor(title_is, 'Log in')
     switch_to_window()
     is_textfield('id_email')
     is_textfield('id_password')
     textfield_write('id_email', email)
     textfield_write('id_password', password)
-    button_click(get_element(css_class='btn', name='continue'))
+    button_click(get_element(css_class='btn', name='continue'), wait=False)
+    waitfor(title_is, 'Authenticate to %s' % base_url)
+    waitfor(get_element, tag='body')
     button_click(get_element(css_class='btn', name='yes'))