diff --git a/.travis.yml b/.travis.yml index 722d653a..a9bac95c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,8 @@ gemfile: - gemfiles/rails_5.gemfile - gemfiles/rails_6.gemfile - gemfiles/rails_6.1.gemfile + - gemfiles/rails_7.gemfile + before_script: - bin/rails db:migrate RAILS_ENV=test before_install: diff --git a/Appraisals b/Appraisals index 430a3fb1..ad2baaeb 100644 --- a/Appraisals +++ b/Appraisals @@ -9,3 +9,7 @@ end appraise "rails-6.1" do gem "rails", "~> 6.1" end + +appraise "rails-7" do + gem "rails", "~> 7.0" +end diff --git a/gemfiles/rails_7.gemfile b/gemfiles/rails_7.gemfile new file mode 100644 index 00000000..f8d6e8cd --- /dev/null +++ b/gemfiles/rails_7.gemfile @@ -0,0 +1,8 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rails", "~> 7.0" +gem "pry", group: [:development, :test] + +gemspec path: "../" diff --git a/scim_rails.gemspec b/scim_rails.gemspec index 7472ea65..418bc2a5 100644 --- a/scim_rails.gemspec +++ b/scim_rails.gemspec @@ -17,7 +17,7 @@ Gem::Specification.new do |s| s.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.md"] s.required_ruby_version = "~> 2.4" - s.add_dependency "rails", ">= 5.0", "< 6.2" + s.add_dependency "rails", ">= 5.0", "< 7.1" s.add_runtime_dependency "jwt", ">= 1.5" s.test_files = Dir["spec/**/*"] diff --git a/spec/dummy/config/initializers/assets.rb b/spec/dummy/config/initializers/assets.rb index 01ef3e66..2e54d952 100644 --- a/spec/dummy/config/initializers/assets.rb +++ b/spec/dummy/config/initializers/assets.rb @@ -1,7 +1,7 @@ # Be sure to restart your server when you modify this file. # Version of your assets, change this if you want to expire all your assets. -Rails.application.config.assets.version = '1.0' +#Rails.application.config.assets.version = '1.0' # Add additional assets to the asset load path # Rails.application.config.assets.paths << Emoji.images_path