diff --git a/.circleci/config.yml b/.circleci/config.yml index 92e0a863..a5c46107 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -60,14 +60,17 @@ workflows: - gemfiles/rails7.0_graphql2.1.gemfile - gemfiles/rails7.0_graphql2.2.gemfile - gemfiles/rails7.0_graphql2.3.gemfile + - gemfiles/rails7.0_graphql2.4.gemfile - gemfiles/rails7.1_graphql2.0.gemfile - gemfiles/rails7.1_graphql2.1.gemfile - gemfiles/rails7.1_graphql2.2.gemfile - gemfiles/rails7.1_graphql2.3.gemfile + - gemfiles/rails7.1_graphql2.4.gemfile - gemfiles/rails7.2_graphql2.0.gemfile - gemfiles/rails7.2_graphql2.1.gemfile - gemfiles/rails7.2_graphql2.2.gemfile - gemfiles/rails7.2_graphql2.3.gemfile + - gemfiles/rails7.2_graphql2.4.gemfile exclude: - ruby-version: '2.7' gemfile: gemfiles/rails7.2_graphql2.0.gemfile @@ -77,6 +80,8 @@ workflows: gemfile: gemfiles/rails7.2_graphql2.2.gemfile - ruby-version: '2.7' gemfile: gemfiles/rails7.2_graphql2.3.gemfile + - ruby-version: '2.7' + gemfile: gemfiles/rails7.2_graphql2.4.gemfile - ruby-version: '3.0' gemfile: gemfiles/rails7.2_graphql2.0.gemfile - ruby-version: '3.0' @@ -85,6 +90,8 @@ workflows: gemfile: gemfiles/rails7.2_graphql2.2.gemfile - ruby-version: '3.0' gemfile: gemfiles/rails7.2_graphql2.3.gemfile + - ruby-version: '3.0' + gemfile: gemfiles/rails7.2_graphql2.4.gemfile - ruby-version: '3.2' gemfile: gemfiles/rails6.0_graphql1.11.gemfile - ruby-version: '3.2' diff --git a/Appraisals b/Appraisals index c51bc1fa..08874641 100644 --- a/Appraisals +++ b/Appraisals @@ -133,6 +133,15 @@ appraise 'rails7.0-graphql2.3' do gem 'graphql', '>= 2.3', '< 2.4' end +appraise 'rails7.0-graphql2.4' do + gem 'sassc-rails' + gem 'sqlite3', '~> 1.5.4' + gem 'devise_token_auth', '>= 1.2.1' + gem 'devise', '>= 4.7' + gem 'rails', git: 'https://github.com/rails/rails', branch: '7-0-stable' + gem 'graphql', '>= 2.4', '< 2.5' +end + appraise 'rails7.1-graphql2.0' do gem 'sassc-rails' gem 'sqlite3', '~> 1.5.4' @@ -169,6 +178,15 @@ appraise 'rails7.1-graphql2.3' do gem 'graphql', '>= 2.3', '< 2.4' end +appraise 'rails7.1-graphql2.4' do + gem 'sassc-rails' + gem 'sqlite3', '~> 1.5.4' + gem 'devise_token_auth', '>= 1.2.1' + gem 'devise', '>= 4.7' + gem 'rails', git: 'https://github.com/rails/rails', branch: '7-1-stable' + gem 'graphql', '>= 2.4', '< 2.5' +end + appraise 'rails7.2-graphql2.0' do gem 'sassc-rails' gem 'devise_token_auth', '>= 1.2.1' @@ -200,3 +218,11 @@ appraise 'rails7.2-graphql2.3' do gem 'rails', git: 'https://github.com/rails/rails', branch: '7-2-stable' gem 'graphql', '>= 2.3', '< 2.4' end + +appraise 'rails7.2-graphql2.4' do + gem 'sassc-rails' + gem 'devise_token_auth', '>= 1.2.1' + gem 'devise', '>= 4.7' + gem 'rails', git: 'https://github.com/rails/rails', branch: '7-2-stable' + gem 'graphql', '>= 2.4', '< 2.5' +end diff --git a/gemfiles/rails7.0_graphql2.4.gemfile b/gemfiles/rails7.0_graphql2.4.gemfile new file mode 100644 index 00000000..e8a0c5f1 --- /dev/null +++ b/gemfiles/rails7.0_graphql2.4.gemfile @@ -0,0 +1,12 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "sassc-rails" +gem "sqlite3", "~> 1.5.4" +gem "devise_token_auth", ">= 1.2.1" +gem "devise", ">= 4.7" +gem "rails", git: "https://github.com/rails/rails", branch: "7-0-stable" +gem "graphql", ">= 2.4", "< 2.5" + +gemspec path: "../" diff --git a/gemfiles/rails7.1_graphql2.4.gemfile b/gemfiles/rails7.1_graphql2.4.gemfile new file mode 100644 index 00000000..78591d5f --- /dev/null +++ b/gemfiles/rails7.1_graphql2.4.gemfile @@ -0,0 +1,12 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "sassc-rails" +gem "sqlite3", "~> 1.5.4" +gem "devise_token_auth", ">= 1.2.1" +gem "devise", ">= 4.7" +gem "rails", git: "https://github.com/rails/rails", branch: "7-1-stable" +gem "graphql", ">= 2.4", "< 2.5" + +gemspec path: "../" diff --git a/gemfiles/rails7.2_graphql2.4.gemfile b/gemfiles/rails7.2_graphql2.4.gemfile new file mode 100644 index 00000000..ac7448d5 --- /dev/null +++ b/gemfiles/rails7.2_graphql2.4.gemfile @@ -0,0 +1,11 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "sassc-rails" +gem "devise_token_auth", ">= 1.2.1" +gem "devise", ">= 4.7" +gem "rails", git: "https://github.com/rails/rails", branch: "7-2-stable" +gem "graphql", ">= 2.4", "< 2.5" + +gemspec path: "../" diff --git a/graphql_devise.gemspec b/graphql_devise.gemspec index dbb5ec05..ec862a4e 100644 --- a/graphql_devise.gemspec +++ b/graphql_devise.gemspec @@ -28,7 +28,7 @@ Gem::Specification.new do |spec| spec.required_ruby_version = '>= 2.7.0' spec.add_dependency 'devise_token_auth', '>= 0.1.43', '< 2.0' - spec.add_dependency 'graphql', '>= 1.8', '< 2.4' + spec.add_dependency 'graphql', '>= 1.8', '< 2.5' spec.add_dependency 'rails', '>= 6.0', '< 7.3' spec.add_dependency 'zeitwerk' diff --git a/spec/requests/mutations/register_spec.rb b/spec/requests/mutations/register_spec.rb index 2aa7d4e1..50ee062b 100644 --- a/spec/requests/mutations/register_spec.rb +++ b/spec/requests/mutations/register_spec.rb @@ -128,7 +128,7 @@ it 'skips the register mutation' do expect(json_response[:errors]).to contain_exactly( - hash_including(message: "Field 'adminRegister' doesn't exist on type 'Mutation'") + hash_including(message: a_string_including("Field 'adminRegister' doesn't exist on type 'Mutation'")) ) end end