diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a856e5c..b4ee786 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,23 +1,24 @@ before_script: - mkdir -p tmp/pids log - - script/noosfero-plugins disableall - bundle check || bundle install + - script/noosfero-plugins disableall + - rm -f tmp/makemo.stamp && rake makemo &>/dev/null # database - cp config/database.yml.gitlab-ci config/database.yml - createdb gitlab_ci_test || true - - bundle exec rake db:schema:load - - bundle exec rake db:migrate + - bundle exec rake db:schema:load &>/dev/null + - bundle exec rake db:migrate &>/dev/null units: - script: 'bundle exec rake test:units' + script: bundle exec rake test:units functionals: - script: 'bundle exec rake test:functionals' + script: bundle exec rake test:functionals integration: - script: 'bundle exec rake test:integration' + script: bundle exec rake test:integration cucumber: - script: 'bundle exec rake cucumber' + script: bundle exec rake cucumber selenium: - script: 'bundle exec rake selenium' + script: bundle exec rake selenium plugins: - script: 'bundle exec rake test:noosfero_plugins' + script: bundle exec rake test:noosfero_plugins diff --git a/.travis.yml b/.travis.yml index 2bde06a..262ea38 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ rvm: before_install: # dependencies - sudo apt-get update - - sudo apt-get -y install po4a iso-codes tango-icon-theme pidgin-data openjdk-6-jre curl wget + - sudo apt-get -y install po4a iso-codes tango-icon-theme pidgin-data default-jre - sudo apt-get -y install libmagickwand-dev libpq-dev libreadline-dev libsqlite3-dev libxslt1-dev # selenium support - export DISPLAY=:99.0 @@ -14,8 +14,9 @@ before_install: before_script: - mkdir -p tmp/pids log - - script/noosfero-plugins disableall - bundle check || bundle install + - script/noosfero-plugins disableall + - rake makemo # database - cp config/database.yml.travis config/database.yml - psql -c 'create database myapp_test;' -U postgres -- libgit2 0.21.2