[zanata/zanata-server] 1dd525: Squashed commit of the following:

GitHub noreply at github.com
Wed May 13 11:27:08 UTC 2015


  Branch: refs/heads/integration/master
  Home:   https://github.com/zanata/zanata-server
  Commit: 1dd52588ccf7b0e2ce2a182e04cd83aa8827e3f6
      https://github.com/zanata/zanata-server/commit/1dd52588ccf7b0e2ce2a182e04cd83aa8827e3f6
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-05-13 (Wed, 13 May 2015)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/main/java/org/zanata/page/WebDriverFactory.java
    M functional-test/src/main/java/org/zanata/page/account/EditProfilePage.java
    M functional-test/src/main/java/org/zanata/page/account/InactiveAccountPage.java
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
    M functional-test/src/main/java/org/zanata/page/account/SignInPage.java
    M functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/EditHomeCodePage.java
    M functional-test/src/main/java/org/zanata/page/administration/EditHomeContentPage.java
    M functional-test/src/main/java/org/zanata/page/administration/EditRoleAssignmentPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageSearchPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserPage.java
    M functional-test/src/main/java/org/zanata/page/administration/RoleAssignmentsPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
    M functional-test/src/main/java/org/zanata/page/administration/TranslationMemoryEditPage.java
    M functional-test/src/main/java/org/zanata/page/administration/TranslationMemoryPage.java
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardActivityTab.java
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardBasePage.java
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardProjectsTab.java
    M functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardAccountTab.java
    M functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardClientTab.java
    M functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardProfileTab.java
    M functional-test/src/main/java/org/zanata/page/glossary/GlossaryPage.java
    M functional-test/src/main/java/org/zanata/page/googleaccount/GoogleAccountPage.java
    M functional-test/src/main/java/org/zanata/page/googleaccount/GooglePermissionsPage.java
    M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupsPage.java
    M functional-test/src/main/java/org/zanata/page/languages/ContactTeamPage.java
    M functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
    M functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.java
    M functional-test/src/main/java/org/zanata/page/projects/CreateProjectPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectAboutPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectBasePage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectMaintainersPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectVersionsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectAboutTab.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectGeneralTab.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectLanguagesTab.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectTranslationTab.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectWebHooksTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionBasePage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionDocumentsPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionLanguagesPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionLanguagesTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionTranslationTab.java
    M functional-test/src/main/java/org/zanata/page/utility/ContactAdminFormPage.java
    M functional-test/src/main/java/org/zanata/page/utility/HomePage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/DocumentsViewPage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    M functional-test/src/main/java/org/zanata/util/TestFileGenerator.java
    M functional-test/src/main/java/org/zanata/util/WebElementUtil.java
    M functional-test/src/main/java/org/zanata/workflow/AbstractWebWorkFlow.java
    M functional-test/src/main/java/org/zanata/workflow/LanguageWorkFlow.java
    M functional-test/src/main/java/org/zanata/workflow/ProjectWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/AutoRoleAssignmentTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditTranslationMemoryTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageSearchTest.java
    M functional-test/src/test/java/org/zanata/feature/document/FileTypeUploadTest.java
    M functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
    M functional-test/src/test/java/org/zanata/feature/document/UploadTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/EditorFilterMessagesTest.java
    M functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/ObsoleteTextTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditPermissionsTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditWebHooksTest.java
    M functional-test/src/test/java/org/zanata/feature/project/SetProjectVisibilityTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionLanguagesTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/VersionFilteringTest.java
    M functional-test/src/test/java/org/zanata/feature/search/PersonSearchTest.java
    M functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
    M zanata-war/src/main/webapp/admin/rolemanager.xhtml
    M zanata-war/src/main/webapp/admin/rolerules.xhtml

  Log Message:
  -----------
  Squashed commit of the following:

commit d8f00669cb49c9d3bcb22cf31f7c072d84ee15a6
Author: Damian Jansen <djansen at redhat.com>
Date:   Wed May 13 09:26:25 2015 +1000

    Fix tests broken in disable-implicit-wait merge

commit a681d4e844d980802135738fcda05ddfe47bda4e
Author: Damian Jansen <djansen at redhat.com>
Date:   Tue May 12 13:02:26 2015 +1000

    Cleanup on merge to master

commit 4941f18bbee5332a48af01f6eddfd8b5a6d2e50c
Author: Damian Jansen <djansen at redhat.com>
Date:   Mon May 11 11:14:33 2015 +1000

    Add a remove notifications step

    Notifications were getting in the way, on occasion. Remove them before
    proceeding with clicks.

commit ab18e760460c4a84b7fd29f473531d801045748f
Author: Damian Jansen <djansen at redhat.com>
Date:   Fri May 8 13:55:56 2015 +1000

    Fix more timing failures in tests

    Conflicts:
    	functional-test/src/main/java/org/zanata/page/BasePage.java
    	functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    	functional-test/src/main/java/org/zanata/workflow/LanguageWorkFlow.java

commit c8fe7d401e7f1926ebf74ee0c2f4fd782c601ea1
Author: Damian Jansen <djansen at redhat.com>
Date:   Thu May 7 12:56:18 2015 +1000

    Rename expect to ready/existing

    In tests it's clearer to see what's being acted upon, a ready
    element or merely an existing one.

    Conflicts:
    	functional-test/src/main/java/org/zanata/page/CorePage.java
    	functional-test/src/main/java/org/zanata/page/account/InactiveAccountPage.java
    	functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
    	functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
    	functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    	functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    	functional-test/src/main/java/org/zanata/page/groups/VersionGroupsPage.java
    	functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    	functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
    	functional-test/src/main/java/org/zanata/page/utility/ContactAdminFormPage.java

commit c57bb2efd1adc641ba4a0433418c1ae44382271d
Author: Damian Jansen <djansen at redhat.com>
Date:   Thu May 7 09:53:55 2015 +1000

    Fix admin tests due to removal of implicit wait

commit 5c73d6d9f8a2e67db3483739b3b57bb0cf5d5a4c
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Thu Apr 23 16:44:18 2015 +1000

    Wait for page silence then simply check condition

    Instead of waiting for a condition to be true, and eventually throwing
    a TimeoutException if it is never true, we waitForPageSilence() and
    then check the condition, which will allow for more meaningful error
    messages.

    Conflicts:
    	functional-test/src/main/java/org/zanata/page/BasePage.java
    	functional-test/src/main/java/org/zanata/page/CorePage.java
    	functional-test/src/main/java/org/zanata/page/account/InactiveAccountPage.java
    	functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
    	functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
    	functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    	functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    	functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
    	functional-test/src/main/java/org/zanata/page/groups/VersionGroupsPage.java
    	functional-test/src/main/java/org/zanata/page/languages/ContactTeamPage.java
    	functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.java
    	functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    	functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectLanguagesTab.java
    	functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java
    	functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
    	functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionLanguagesTab.java
    	functional-test/src/main/java/org/zanata/page/utility/ContactAdminFormPage.java
    	functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
    	functional-test/src/test/java/org/zanata/feature/document/UploadTest.java
    	functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
    	functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    	functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionLanguagesTest.java

commit 2835c5c78ffe2b97b4fc3c0328ec14c9eb6fbc63
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Thu Apr 23 12:41:42 2015 +1000

    Avoid reusing FluentWait to avoid stale messages

    Conflicts:
    	functional-test/src/main/java/org/zanata/page/AbstractPage.java

commit a518a6ff69a93fad5917518e10651a1fbd9a4b09
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Thu Apr 23 11:41:41 2015 +1000

    Increase timeout from 10 to 20 seconds

commit 703b8dfdedbf77ea5ecdd160fccbae7ee6e99466
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Fri Apr 17 15:53:34 2015 +1000

    Wait for page silence after defocus

commit ff636fb6275f39b7aba2e580513ba25bb61b66dc
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Fri Apr 17 14:04:47 2015 +1000

    Disable implicit wait in Selenium tests




More information about the zanata-commits mailing list