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

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