Download as
Browse Code »

Commit fa13b303d2d2cd0d817bf655183160e64ab47b24

Authored by Victor Costa
2 parents 0d1f104b 5ae4a98c
Exists in staging and in 3 other branches captcha_serpro_plugin, production, production-vendorized

Merge branch 'staging' of softwarepublico.gov.br:noosferogov/noosfero into staging

Showing 1 changed file with 2 additions and 2 deletions   Show diff stats
@@ -29,7 +29,7 @@ git: @@ -29,7 +29,7 @@ git:
29 29
30 # workaround for https://github.com/travis-ci/travis-ci/issues/4536 30 # workaround for https://github.com/travis-ci/travis-ci/issues/4536
31 before_install: 31 before_install:
32 - - rm Gemfile.lock 32 + - rm -f Gemfile.lock
33 - export GEM_HOME=$PWD/vendor/bundle/ruby/2.2.0 33 - export GEM_HOME=$PWD/vendor/bundle/ruby/2.2.0
34 - gem install bundler 34 - gem install bundler
35 - sed -i 's/softwarepublico.gov.br\/gitlab/github.com/' .gitmodules 35 - sed -i 's/softwarepublico.gov.br\/gitlab/github.com/' .gitmodules
@@ -54,7 +54,7 @@ env: @@ -54,7 +54,7 @@ env:
54 - TASK=selenium 54 - TASK=selenium
55 - TASK=test:noosfero_plugins BUNDLE_OPTS=install 55 - TASK=test:noosfero_plugins BUNDLE_OPTS=install
56 # Redundant, but makes life easier instead of counting each failling test, this summarizes everything 56 # Redundant, but makes life easier instead of counting each failling test, this summarizes everything
57 - - TASK=test 57 + - TASK=rake test:all:db
58 58
59 script: 59 script:
60 - bundle exec rake $TASK 60 - bundle exec rake $TASK