Index: apps/selenium/tests/seleniumtest.py =================================================================== --- apps/selenium/tests/seleniumtest.py (revision 1810) +++ apps/selenium/tests/seleniumtest.py (working copy) @@ -6,7 +6,11 @@ BROWSER = "*firefox" TARGET_URL = "http://localhost:8000" +TIMEOUT = 10000 +ADMIN_USERNAME = "admin" +ADMIN_PASSWORD = "admin" + class SeleniumTestCase(unittest.TestCase): def setUp(self): Index: apps/selenium/tests/test_wiki.py =================================================================== --- apps/selenium/tests/test_wiki.py (revision 0) +++ apps/selenium/tests/test_wiki.py (revision 0) @@ -0,0 +1,124 @@ +from selenium import selenium +import seleniumtest +import random + +class TestWiki(seleniumtest.SeleniumTestCase): + + def get_to_wiki_page(self): + self.selenium.open("/") + self.selenium.click("//ul[@class='projects-list']/li[1]//a") + self.selenium.wait_for_page_to_load(seleniumtest.TIMEOUT) + if self.selenium.is_element_present("//a[@id='login']"): + #We need to log in + self.selenium.click("//a[@id='login']") + self.selenium.wait_for_page_to_load(seleniumtest.TIMEOUT) + self.selenium.type("//input[@name='username']", seleniumtest.ADMIN_USERNAME) + self.selenium.type("//input[@name='password']", seleniumtest.ADMIN_PASSWORD) + self.selenium.click("//input[@id='login-button']") + self.selenium.wait_for_page_to_load(seleniumtest.TIMEOUT) + + self.selenium.click("//li[@class='wiki']/a") + self.selenium.wait_for_page_to_load(seleniumtest.TIMEOUT) + + def test_wiki_create_page(self): + self.get_to_wiki_page() + self.selenium.click("//input[@id='wiki-new-page']") + self.selenium.wait_for_page_to_load(seleniumtest.TIMEOUT) + + wiki_page_name = "This is a wiki page name " + str(random.randint(1, 10000)) + wiki_page_content = "Some wiki content" + + self.selenium.type("//input[@name='name']", wiki_page_name) + self.selenium.type("//textarea[@name='content']", wiki_page_content) + self.selenium.click("//input[@name='Submit']") + self.selenium.wait_for_page_to_load(seleniumtest.TIMEOUT) + + name_in_page = self.selenium.is_element_present("//h2[text()='"+wiki_page_name+"']") + self.assertTrue(name_in_page) + + content_in_page = self.selenium.is_text_present(wiki_page_content) + self.assertTrue(content_in_page) + + def test_wiki_edit_page(self): + self.get_to_wiki_page() + self.selenium.click("//table[@id='wikipages']//tr[1]/td[1]/a") + self.selenium.wait_for_page_to_load(seleniumtest.TIMEOUT) + self.selenium.click("//a[@id='edit-wiki']") + self.selenium.wait_for_page_to_load(seleniumtest.TIMEOUT) + self.selenium.type("//textarea[@name='content']", "TEST Content") + self.selenium.click("//input[@name='Save']") + self.selenium.wait_for_page_to_load(seleniumtest.TIMEOUT) + self.assertTrue(self.selenium.is_text_present("TEST Content")) + + def find_current_page_version(self): + #Utility function that finds the current version number + self.selenium.click("//a[@id='history-wiki']") + self.selenium.wait_for_page_to_load(seleniumtest.TIMEOUT) + version_number_string = self.selenium.get_text("//table[@id='wiki_versions']//tr[1]/td[1]/a[1]") + + self.selenium.click("//a[@id='current-version-wiki']") + self.selenium.wait_for_page_to_load(seleniumtest.TIMEOUT) + + return int(version_number_string) + + def test_wiki_old_versions(self): + self.get_to_wiki_page() + + self.selenium.click("//table[@id='wikipages']//tr[1]/td[1]/a") + self.selenium.wait_for_page_to_load(seleniumtest.TIMEOUT) + + version_before = self.find_current_page_version() + + #Edit the page + self.selenium.click("//a[@id='edit-wiki']") + self.selenium.wait_for_page_to_load(seleniumtest.TIMEOUT) + self.selenium.type("//textarea[@name='content']", "modifications " + str(random.randint(1, 10000))) + self.selenium.click("//input[@name='Save']") + self.selenium.wait_for_page_to_load(seleniumtest.TIMEOUT) + + version_after = self.find_current_page_version() + + #Verify that the version number has been incremented + self.assertTrue(version_after == version_before+1) + + def test_wiki_diff(self): + self.get_to_wiki_page() + + self.selenium.click("//table[@id='wikipages']//tr[1]/td[1]/a") + self.selenium.wait_for_page_to_load(seleniumtest.TIMEOUT) + + #Edit the page + self.selenium.click("//a[@id='edit-wiki']") + self.selenium.wait_for_page_to_load(seleniumtest.TIMEOUT) + + random_text = str(random.randint(1, 10000)) + text_before = "This is before " + random_text + self.selenium.type("//textarea[@name='content']", text_before) + self.selenium.click("//input[@name='Save']") + self.selenium.wait_for_page_to_load(seleniumtest.TIMEOUT) + + #Edit the same page again + self.selenium.click("//a[@id='edit-wiki']") + self.selenium.wait_for_page_to_load(seleniumtest.TIMEOUT) + + text_after = "This is after" + self.selenium.type("//textarea[@name='content']", text_after) + self.selenium.click("//input[@name='Save']") + self.selenium.wait_for_page_to_load(seleniumtest.TIMEOUT) + + #Get to the diff page + self.selenium.click("//a[@id='history-wiki']") + self.selenium.wait_for_page_to_load(seleniumtest.TIMEOUT) + + self.selenium.click("//table[@id='wiki_versions']//tr[2]/td/a[2]") + self.selenium.wait_for_page_to_load(seleniumtest.TIMEOUT) + + #Make sure that the diff is correct + substracted_text = self.selenium.get_text("//table//td[3]/span[@class='diff_sub']") + self.assertEquals(text_before, substracted_text) + + added_text = self.selenium.get_text("//table//td[6]/span[@class='diff_add']") + self.assertEquals(text_after, added_text) + +if __name__ == "__main__": + seleniumtest.main() \ No newline at end of file Index: apps/wiki/templates/wiki/wiki_detail.html =================================================================== --- apps/wiki/templates/wiki/wiki_detail.html (revision 1810) +++ apps/wiki/templates/wiki/wiki_detail.html (working copy) @@ -19,10 +19,10 @@
{% if perms.wiki.change_wikipage %} - {% trans "Edit this page" %} + {% trans "Edit this page" %} {% endif %} - {% trans "Old Versions" %} - {% trans "Page List" %} + {% trans "Old Versions" %} + {% trans "Page List" %}

{{ page.name }}

Index: apps/wiki/templates/wiki/wiki_history.html =================================================================== --- apps/wiki/templates/wiki/wiki_history.html (revision 1810) +++ apps/wiki/templates/wiki/wiki_history.html (working copy) @@ -21,7 +21,7 @@ {% block body %}