diff --git a/.travis.yml b/.travis.yml index f08d570..f6c1b66 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ gemfile: - gemfiles/5.0.gemfile - gemfiles/5.1.gemfile - gemfiles/5.2.gemfile + - gemfiles/6.0.gemfile rvm: - 2.3.8 - 2.4.7 diff --git a/Appraisals b/Appraisals index 4bb41b2..a3b8a3b 100644 --- a/Appraisals +++ b/Appraisals @@ -9,3 +9,7 @@ end appraise "5.2" do gem "rails", "5.2.rc2" end + +appraise "6.0" do + gem "rails", "~> 6.0.0" +end diff --git a/gemfiles/6.0.gemfile b/gemfiles/6.0.gemfile new file mode 100644 index 0000000..ddccdc4 --- /dev/null +++ b/gemfiles/6.0.gemfile @@ -0,0 +1,22 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "appraisal" +gem "rails", "~> 6.0.0" + +group :development, :test do + gem "sqlite3", platform: :mri +end + +group :development do + gem "onkcop", require: false +end + +group :test do + gem "factory_bot_rails" + gem "rspec-rails" + gem "shoulda-matchers" +end + +gemspec path: "../" diff --git a/lib/approval/engine.rb b/lib/approval/engine.rb index 04e8f57..03c9365 100644 --- a/lib/approval/engine.rb +++ b/lib/approval/engine.rb @@ -1,4 +1,5 @@ require "rails" +require "approval/mixins" module Approval class Engine < ::Rails::Engine diff --git a/app/models/concerns/approval/mixins.rb b/lib/approval/mixins.rb similarity index 100% rename from app/models/concerns/approval/mixins.rb rename to lib/approval/mixins.rb