Removed redundant xvfb script call.

ekylibre · Jul 7, 2016 · ac19c35 · ac19c35
1 parent ac1c72b
commit ac19c35
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,9 +3,11 @@ bundler_args: --full-index --without development
 cache: bundler
 rvm:
   - 2.2.3
+global:
+  - DISPLAY=":99.0
 env:
-  - TEST_LOCALE=fra DISPLAY=":99.0"
-  - TEST_LOCALE=eng DISPLAY=":99.0"
+  - TEST_LOCALE=fra
+  - TEST_LOCALE=eng
 before_install: test/ci/before_install
 before_script:  test/ci/before_script
 script: xvfb-run bundle exec rake test:run_all DRIVER=webkit LOCALE=$TEST_LOCALE

diff --git a/test/ci/before_script b/test/ci/before_script
@@ -4,8 +4,6 @@ psql -U postgres -d ekylibre_test -c 'CREATE SCHEMA IF NOT EXISTS postgis;'
 psql -U postgres -d ekylibre_test -c 'CREATE EXTENSION IF NOT EXISTS postgis SCHEMA postgis;'
 psql -U postgres -d ekylibre_test -c 'CREATE EXTENSION IF NOT EXISTS "uuid-ossp" SCHEMA postgis;'
 
-sh -e /etc/init.d/xvfb start
-
 cp -f test/ci/database.yml config/database.yml
 
 bundle exec rake db:migrate RAILS_ENV=test