Skip to content

Commit

Permalink
Fix unit test and support rails 6.0
Browse files Browse the repository at this point in the history
Signed-off-by: Florian Wininger <[email protected]>
  • Loading branch information
fwininger committed Sep 11, 2019
1 parent 2742687 commit e26a82c
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 4 deletions.
19 changes: 16 additions & 3 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,27 +50,40 @@ 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:
- gem update --system
- gem install bundler
- rvm: 2.6
gemfile: gemfiles/6.0.gemfile
before_install:
- gem update --system
- gem install bundler
- rvm: 2.6
gemfile: gemfiles/rails_edge.gemfile
before_install:
- gem update --system
- gem install bundler
- rvm: ruby-head
gemfile: gemfiles/5.2.gemfile
gemfile: gemfiles/6.0.gemfile
before_install:
- gem install bundler -v '~> 2'
- rvm: ruby-head
gemfile: gemfiles/rails_edge.gemfile
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
9 changes: 9 additions & 0 deletions gemfiles/6.0.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
source 'https://rubygems.org'

gem 'rdoc'
gem 'rails', '~> 6.0'
gem 'sqlite3'
gem 'bootsnap' # required to run `rake test` in Rails 6.0
gem 'mocha', '= 1.3' # newer versions blow up

gemspec path: '../'

0 comments on commit e26a82c

Please sign in to comment.