Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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'
Expand All @@ -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'
Expand Down
26 changes: 26 additions & 0 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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
12 changes: 12 additions & 0 deletions gemfiles/rails7.0_graphql2.4.gemfile
Original file line number Diff line number Diff line change
@@ -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: "../"
12 changes: 12 additions & 0 deletions gemfiles/rails7.1_graphql2.4.gemfile
Original file line number Diff line number Diff line change
@@ -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: "../"
11 changes: 11 additions & 0 deletions gemfiles/rails7.2_graphql2.4.gemfile
Original file line number Diff line number Diff line change
@@ -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: "../"
2 changes: 1 addition & 1 deletion graphql_devise.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down
2 changes: 1 addition & 1 deletion spec/requests/mutations/register_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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'"))
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

graphql 2.4 adds additional information to the error message. But we only care in the spec about the field not being defined in the API

)
end
end
Expand Down