Merge lp:~elopio/ubuntuone-testing/fix-public-url into lp:ubuntuone-testing

[Leo Arias]

Fixes the public url bug in u1webf003, and a little refactoring.

For u1webf003, fixed the same url public bug that was present on u1webf002.
A little refactoring to return the two parts of the URL, and to add a funciton that navigates to the file.

[Rick McBride (rmcbride)]

Cool!

review: Approve

=== modified file 'ubuntuone/web/tests/sst/files/u1webf002_publishfile.py'
--- ubuntuone/web/tests/sst/files/u1webf002_publishfile.py	2011-11-07 17:12:35 +0000
+++ ubuntuone/web/tests/sst/files/u1webf002_publishfile.py	2011-11-17 22:08:29 +0000
@@ -28,7 +28,6 @@
 import os.path
 import tempfile
 import uuid
-import urlparse
 
 setup_actions.setup()
 files_actions.open()
@@ -45,8 +44,5 @@
     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)
-parsed_url = urlparse.urlparse(file_url)
-set_base_url(file_url[:-len(parsed_url.path)])
-goto(parsed_url.path)
+file_url = files_actions.go_to_public_url(file_name)
 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-11-04 23:02:16 +0000
+++ ubuntuone/web/tests/sst/files/u1webf003_stoppublishingfile.py	2011-11-17 22:08:29 +0000
@@ -28,7 +28,6 @@
 import os.path
 import tempfile
 import uuid
-import urlparse
 
 setup_actions.setup()
 files_actions.open()
@@ -45,10 +44,9 @@
     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)
+base_url, path = files_actions.get_public_url(file_name)
 files_actions.stop_publishing_file(file_name)
 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)
+set_base_url(base_url)
+goto(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-15 19:12:12 +0000
+++ ubuntuone/web/tests/sst/shared/actions/files.py	2011-11-17 22:08:29 +0000
@@ -23,6 +23,7 @@
 from sst.actions import _get_elem
 from config import DEFAULT_TIMEOUT
 from loading import *
+import urlparse
 
 def open():
     """Open the files page and assert it's title."""
@@ -248,7 +249,16 @@
     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')
+    public_url = input_public_url.get_attribute('value')
+    parsed_url = urlparse.urlparse(public_url)
+    base_url = public_url[:-len(parsed_url.path)]
+    path = parsed_url.path
+    return base_url, path
+
+def go_to_public_url(name):
+    base_url, path = get_public_url(name)
+    set_base_url(base_url)
+    goto(path)
 
 def stop_publishing_file(name):
     """Stop publishing a file.