Merged r14074 from trunk to 3.0-stable

run ui test on travis

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14075 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/.travis.yml b/.travis.yml
index 88623900803588b662ce288ce52e9a86182600cc..7b6b93c84a20f3fdd26d7ecf01bb229ca7a19acb 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,12 +18,15 @@ env:
   - "TEST_SUITE=units       DATABASE_ADAPTER=postgresql"
   - "TEST_SUITE=functionals DATABASE_ADAPTER=postgresql"
   - "TEST_SUITE=integration DATABASE_ADAPTER=postgresql"
+  - "TEST_SUITE=ui          DATABASE_ADAPTER=postgresql"
   - "TEST_SUITE=units       DATABASE_ADAPTER=mysql"
   - "TEST_SUITE=functionals DATABASE_ADAPTER=mysql"
   - "TEST_SUITE=integration DATABASE_ADAPTER=mysql"
+  - "TEST_SUITE=ui          DATABASE_ADAPTER=mysql"
   - "TEST_SUITE=units       DATABASE_ADAPTER=sqlite3"
   - "TEST_SUITE=functionals DATABASE_ADAPTER=sqlite3"
   - "TEST_SUITE=integration DATABASE_ADAPTER=sqlite3"
+  - "TEST_SUITE=ui          DATABASE_ADAPTER=sqlite3"
 before_install:
   - "sudo apt-get update -qq"
   - "sudo apt-get --no-install-recommends install bzr cvs git mercurial subversion"
@@ -35,6 +38,7 @@ script:
   - "RUN_ON_NOT_OFFICIAL='' RUBY_VER=1.9 BRANCH=trunk bundle exec rake config/database.yml"
   - "bundle install"
   - "bundle exec rake ci:setup"
+  - phantomjs --webdriver 4444 &
   - JRUBY_OPTS=-J-Xmx1024m bundle exec rake test:${TEST_SUITE}
 notifications:
   email: false