[zanata/zanata-server] 6ea385: fix database script in functional test

[GitHub]

  Branch: refs/heads/dashboard
  Home:   https://github.com/zanata/zanata-server
  Commit: 6ea385d4becd91fc526d1cdff7d14965b90990bb
      https://github.com/zanata/zanata-server/commit/6ea385d4becd91fc526d1cdff7d14965b90990bb
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
    M functional-test/src/test/java/org/zanata/util/DatabaseHelper.java
    M functional-test/src/test/resources/concordion/org/zanata/feature/zanata_with_data.sql

  Log Message:
  -----------
  fix database script in functional test


  Commit: 63185e448cc300a3fb4ecf7d7cd16984544b69c9
      https://github.com/zanata/zanata-server/commit/63185e448cc300a3fb4ecf7d7cd16984544b69c9
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java

  Log Message:
  -----------
  ensure sign out before register test


  Commit: d891da9bf4ee37829e44f9123463e8c0c56d0bcb
      https://github.com/zanata/zanata-server/commit/d891da9bf4ee37829e44f9123463e8c0c56d0bcb
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/utility/HomePage.java

  Log Message:
  -----------
  move admin visible elements out of annotated fields


  Commit: b85f72decb188eb1fdc5fb76da5354a0ae05113a
      https://github.com/zanata/zanata-server/commit/b85f72decb188eb1fdc5fb76da5354a0ae05113a
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    M functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.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/account/ValidEmailAddressTest.java

  Log Message:
  -----------
  change tests that go to registration page delete cookies first(sign out)


  Commit: a07a9f1e88423e12f7172407da9f6a03074b047d
      https://github.com/zanata/zanata-server/commit/a07a9f1e88423e12f7172407da9f6a03074b047d
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
    M functional-test/src/main/java/org/zanata/page/utility/HomePage.java
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    M functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.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/account/ValidEmailAddressTest.java
    M functional-test/src/test/java/org/zanata/util/DatabaseHelper.java
    M functional-test/src/test/resources/concordion/org/zanata/feature/zanata_with_data.sql

  Log Message:
  -----------
  Merge pull request #84 from zanata/fix-functional-test

fix functional test


  Commit: 553f957adae4acd80a2fcde17d9c457e8443f03e
      https://github.com/zanata/zanata-server/commit/553f957adae4acd80a2fcde17d9c457e8443f03e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
    M functional-test/src/main/java/org/zanata/page/utility/HomePage.java
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    M functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.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/account/ValidEmailAddressTest.java
    M functional-test/src/test/java/org/zanata/util/DatabaseHelper.java
    M functional-test/src/test/resources/concordion/org/zanata/feature/zanata_with_data.sql

  Log Message:
  -----------
  Merge branch 'integration/master' into dashboard

Conflicts:
	functional-test/src/main/java/org/zanata/page/BasePage.java
	functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java


  Commit: 6d46c7295393c2cb9c32607a3de48b8b2f79ae51
      https://github.com/zanata/zanata-server/commit/6d46c7295393c2cb9c32607a3de48b8b2f79ae51
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
    M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
    M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
    M zanata-war/src/test/java/org/zanata/service/impl/ActivityServiceImplTest.java

  Log Message:
  -----------
  Fix functional test


Compare: https://github.com/zanata/zanata-server/compare/10c78f479b72...6d46c7295393