Skip to content

Commit

Permalink
Merge pull request #852 from fwininger/fix_unit_test
Browse files Browse the repository at this point in the history
Fix unit tests
  • Loading branch information
unixmonkey authored Oct 2, 2019
2 parents 2742687 + 0672349 commit d318444
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
12 changes: 10 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ before_install:
- sudo apt-get update -qq
bundler_args: --verbose
sudo: required
services:
- xvfb
before_script:
- bundle list
- sudo apt-get install -y wkhtmltopdf
- "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start"
env: WKHTMLTOPDF_BIN=/usr/bin/wkhtmltopdf
script:
- bundle exec rake
Expand Down Expand Up @@ -50,8 +50,14 @@ matrix:
- gem install bundler -v '< 2'
- rvm: 2.5
gemfile: gemfiles/5.2.gemfile
before_install:
- gem update --system
- gem install bundler
- rvm: 2.5
gemfile: gemfiles/rails_edge.gemfile
before_install:
- gem update --system
- gem install bundler
- rvm: 2.6
gemfile: gemfiles/5.2.gemfile
before_install:
Expand All @@ -71,6 +77,8 @@ matrix:
before_install:
- gem install bundler -v '~> 2'
allow_failures:
- rvm: 1.8.7
- rvm: 1.9.2
- rvm: 2.5
gemfile: gemfiles/rails_edge.gemfile
- rvm: 2.6
Expand Down
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ end

desc 'Remove dummy application'
task :dummy_remove do
FileUtils.rm_r Dir.glob('test/dummy/*')
FileUtils.rm_r Dir.glob('test/dummy/')
end

desc 'Generate documentation for the wicked_pdf gem.'
Expand Down

0 comments on commit d318444

Please sign in to comment.