Merge pull request #271 from graphql-devise/add-support-for-newer-gql…

…-versions Add support for newer gql version
graphql-devise · May 9, 2024 · 3767018 · 3767018
2 parents abb5dfb + 97f654e
commit 3767018
Show file tree

Hide file tree

Showing 26 changed files with 104 additions and 28 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -15,6 +15,7 @@ jobs:
       BUNDLE_GEMFILE: << parameters.gemfile >>
       COVERALLS_PARALLEL: true
       EAGER_LOAD: 'true'
+      RUBYOPT: '-rostruct'
     steps:
       - checkout
       - run: gem install bundler -v '1.17'
@@ -27,7 +28,7 @@ jobs:
             bundle exec rspec
   report-coverage:
     docker:
-      - image: 'circleci/node:10.0.0'
+      - image: 'cimg/node:22.1.0'
     steps:
       - coveralls/upload:
           parallel_finished: true
@@ -65,31 +66,9 @@ workflows:
                 - gemfiles/rails7.0_graphql1.13.gemfile
                 - gemfiles/rails7.0_graphql2.0.gemfile
                 - gemfiles/rails7.0_graphql2.1.gemfile
+                - gemfiles/rails7.0_graphql2.2.gemfile
+                - gemfiles/rails7.0_graphql2.3.gemfile
             exclude:
-              - ruby-version: '2.4'
-                gemfile: gemfiles/rails6.0_graphql1.11.gemfile
-              - ruby-version: '2.4'
-                gemfile: gemfiles/rails6.0_graphql1.12.gemfile
-              - ruby-version: '2.4'
-                gemfile: gemfiles/rails6.0_graphql1.13.gemfile
-              - ruby-version: '2.4'
-                gemfile: gemfiles/rails6.1_graphql1.11.gemfile
-              - ruby-version: '2.4'
-                gemfile: gemfiles/rails6.1_graphql1.12.gemfile
-              - ruby-version: '2.4'
-                gemfile: gemfiles/rails6.1_graphql1.13.gemfile
-              - ruby-version: '2.4'
-                gemfile: gemfiles/rails6.1_graphql2.0.gemfile
-              - ruby-version: '2.4'
-                gemfile: gemfiles/rails7.0_graphql1.11.gemfile
-              - ruby-version: '2.4'
-                gemfile: gemfiles/rails7.0_graphql1.12.gemfile
-              - ruby-version: '2.4'
-                gemfile: gemfiles/rails7.0_graphql1.13.gemfile
-              - ruby-version: '2.4'
-                gemfile: gemfiles/rails7.0_graphql2.0.gemfile
-              - ruby-version: '2.4'
-                gemfile: gemfiles/rails7.0_graphql2.1.gemfile
               - ruby-version: '2.5'
                 gemfile: gemfiles/rails7.0_graphql1.11.gemfile
               - ruby-version: '2.5'
@@ -114,6 +93,10 @@ workflows:
                 gemfile: gemfiles/rails6.0_graphql1.12.gemfile
               - ruby-version: '2.5'
                 gemfile: gemfiles/rails6.0_graphql1.11.gemfile
+              - ruby-version: '2.5'
+                gemfile: gemfiles/rails7.0_graphql2.2.gemfile
+              - ruby-version: '2.5'
+                gemfile: gemfiles/rails7.0_graphql2.3.gemfile
               - ruby-version: '2.6'
                 gemfile: gemfiles/rails7.0_graphql1.11.gemfile
               - ruby-version: '2.6'
@@ -124,6 +107,10 @@ workflows:
                 gemfile: gemfiles/rails7.0_graphql2.0.gemfile
               - ruby-version: '2.6'
                 gemfile: gemfiles/rails7.0_graphql2.1.gemfile
+              - ruby-version: '2.6'
+                gemfile: gemfiles/rails7.0_graphql2.2.gemfile
+              - ruby-version: '2.6'
+                gemfile: gemfiles/rails7.0_graphql2.3.gemfile
               - ruby-version: '2.7'
                 gemfile: gemfiles/rails4.2_graphql1.8.gemfile
               - ruby-version: '3.0'

diff --git a/Appraisals b/Appraisals
@@ -5,6 +5,8 @@ appraise 'rails4.2-graphql1.8' do
   gem 'graphql', '~> 1.8.0'
   gem 'devise_token_auth', '< 1.2'
   gem 'rspec-rails', '< 4.0'
+  gem 'bigdecimal', '1.3.5'
+  gem 'factory_bot', '<= 6.4.4'
 end
 
 appraise 'rails5.0-graphql1.8' do
@@ -14,6 +16,7 @@ appraise 'rails5.0-graphql1.8' do
   gem 'devise_token_auth', '0.1.43'
   gem 'devise', '>= 4.0'
   gem 'rspec-rails', '< 4.0'
+  gem 'factory_bot', '<= 6.4.4'
 end
 
 appraise 'rails5.0-graphql1.9' do
@@ -22,6 +25,7 @@ appraise 'rails5.0-graphql1.9' do
   gem 'graphql', '~> 1.9.0'
   gem 'devise_token_auth', '< 1.2'
   gem 'rspec-rails', '< 4.0'
+  gem 'factory_bot', '<= 6.4.4'
 end
 
 appraise 'rails5.1-graphql1.8' do
@@ -31,6 +35,7 @@ appraise 'rails5.1-graphql1.8' do
   gem 'devise_token_auth', '0.1.43'
   gem 'devise', '>= 4.3'
   gem 'rspec-rails', '< 4.0'
+  gem 'factory_bot', '<= 6.4.4'
 end
 
 appraise 'rails5.1-graphql1.9' do
@@ -39,6 +44,7 @@ appraise 'rails5.1-graphql1.9' do
   gem 'graphql', '~> 1.9.0'
   gem 'devise_token_auth', '< 1.2'
   gem 'rspec-rails', '< 4.0'
+  gem 'factory_bot', '<= 6.4.4'
 end
 
 appraise 'rails5.2-graphql1.8' do
@@ -48,6 +54,7 @@ appraise 'rails5.2-graphql1.8' do
   gem 'devise_token_auth', '0.1.43'
   gem 'devise', '>= 4.4.2'
   gem 'rspec-rails', '< 4.0'
+  gem 'factory_bot', '<= 6.4.4'
 end
 
 appraise 'rails5.2-graphql1.9' do
@@ -56,6 +63,7 @@ appraise 'rails5.2-graphql1.9' do
   gem 'graphql', '~> 1.9.0'
   gem 'devise_token_auth', '< 1.2'
   gem 'rspec-rails', '< 4.0'
+  gem 'factory_bot', '<= 6.4.4'
 end
 
 appraise 'rails5.2-graphql1.10' do
@@ -64,6 +72,7 @@ appraise 'rails5.2-graphql1.10' do
   gem 'graphql', '~> 1.10.0'
   gem 'devise_token_auth', '< 1.2'
   gem 'rspec-rails', '< 4.0'
+  gem 'factory_bot', '<= 6.4.4'
 end
 
 appraise 'rails5.2-graphql1.11' do
@@ -72,6 +81,7 @@ appraise 'rails5.2-graphql1.11' do
   gem 'graphql', '~> 1.11.0'
   gem 'devise_token_auth', '< 1.2'
   gem 'rspec-rails', '< 4.0'
+  gem 'factory_bot', '<= 6.4.4'
 end
 
 appraise 'rails5.2-graphql1.12' do
@@ -80,13 +90,15 @@ appraise 'rails5.2-graphql1.12' do
   gem 'graphql', '~> 1.12.0'
   gem 'devise_token_auth', '< 1.2'
   gem 'rspec-rails', '< 4.0'
+  gem 'factory_bot', '<= 6.4.4'
 end
 
 appraise 'rails6.0-graphql1.10' do
   gem 'sqlite3', '~> 1.5.4'
   gem 'devise', '>= 4.7'
   gem 'rails', git: 'https://github.com/rails/rails', branch: '6-0-stable'
   gem 'graphql', '~> 1.10.0'
+  gem 'factory_bot', '<= 6.4.4'
 end
 
 appraise 'rails6.0-graphql1.11' do
@@ -95,6 +107,7 @@ appraise 'rails6.0-graphql1.11' do
   gem 'devise', '>= 4.7'
   gem 'rails', git: 'https://github.com/rails/rails', branch: '6-0-stable'
   gem 'graphql', '~> 1.11.0'
+  gem 'factory_bot', '<= 6.4.4'
 end
 
 appraise 'rails6.0-graphql1.12' do
@@ -103,20 +116,23 @@ appraise 'rails6.0-graphql1.12' do
   gem 'devise', '>= 4.7'
   gem 'rails', git: 'https://github.com/rails/rails', branch: '6-0-stable'
   gem 'graphql', '~> 1.12.0'
+  gem 'factory_bot', '<= 6.4.4'
 end
 
 appraise 'rails6.0-graphql1.13' do
   gem 'sqlite3', '~> 1.5.4'
   gem 'devise', '>= 4.7'
   gem 'rails', git: 'https://github.com/rails/rails', branch: '6-0-stable'
   gem 'graphql', '~> 1.13.0'
+  gem 'factory_bot', '<= 6.4.4'
 end
 
 appraise 'rails6.1-graphql1.10' do
   gem 'sqlite3', '~> 1.5.4'
   gem 'devise', '>= 4.7'
   gem 'rails', git: 'https://github.com/rails/rails', branch: '6-1-stable'
   gem 'graphql', '~> 1.10.0'
+  gem 'factory_bot', '<= 6.4.4'
 end
 
 appraise 'rails6.1-graphql1.11' do
@@ -125,6 +141,7 @@ appraise 'rails6.1-graphql1.11' do
   gem 'devise', '>= 4.7'
   gem 'rails', git: 'https://github.com/rails/rails', branch: '6-1-stable'
   gem 'graphql', '~> 1.11.0'
+  gem 'factory_bot', '<= 6.4.4'
 end
 
 appraise 'rails6.1-graphql1.12' do
@@ -133,13 +150,15 @@ appraise 'rails6.1-graphql1.12' do
   gem 'devise', '>= 4.7'
   gem 'rails', git: 'https://github.com/rails/rails', branch: '6-1-stable'
   gem 'graphql', '~> 1.12.0'
+  gem 'factory_bot', '<= 6.4.4'
 end
 
 appraise 'rails6.1-graphql1.13' do
   gem 'sqlite3', '~> 1.5.4'
   gem 'devise', '>= 4.7'
   gem 'rails', git: 'https://github.com/rails/rails', branch: '6-1-stable'
   gem 'graphql', '~> 1.13.0'
+  gem 'factory_bot', '<= 6.4.4'
 end
 
 appraise 'rails6.1-graphql2.0' do
@@ -148,6 +167,7 @@ appraise 'rails6.1-graphql2.0' do
   gem 'devise', '>= 4.7'
   gem 'rails', git: 'https://github.com/rails/rails', branch: '6-1-stable'
   gem 'graphql', '~> 2.0.1'
+  gem 'factory_bot', '<= 6.4.4'
 end
 
 appraise 'rails7.0-graphql1.11' do
@@ -194,3 +214,21 @@ appraise 'rails7.0-graphql2.1' do
   gem 'rails', git: 'https://github.com/rails/rails', branch: '7-0-stable'
   gem 'graphql', '>= 2.1', '< 2.2'
 end
+
+appraise 'rails7.0-graphql2.2' 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.2.0'
+end
+
+appraise 'rails7.0-graphql2.3' 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.3.0'
+end
diff --git a/gemfiles/rails4.2_graphql1.8.gemfile b/gemfiles/rails4.2_graphql1.8.gemfile
@@ -8,5 +8,7 @@ gem "rails", git: "https://github.com/rails/rails", branch: "4-2-stable"
 gem "graphql", "~> 1.8.0"
 gem "devise_token_auth", "< 1.2"
 gem "rspec-rails", "< 4.0"
+gem "bigdecimal", "1.3.5"
+gem "factory_bot", "<= 6.4.4"
 
 gemspec path: "../"
diff --git a/gemfiles/rails5.0_graphql1.8.gemfile b/gemfiles/rails5.0_graphql1.8.gemfile
@@ -8,5 +8,6 @@ gem "graphql", "~> 1.8.0"
 gem "devise_token_auth", "0.1.43"
 gem "devise", ">= 4.0"
 gem "rspec-rails", "< 4.0"
+gem "factory_bot", "<= 6.4.4"
 
 gemspec path: "../"
diff --git a/gemfiles/rails5.0_graphql1.9.gemfile b/gemfiles/rails5.0_graphql1.9.gemfile
@@ -7,5 +7,6 @@ gem "rails", git: "https://github.com/rails/rails", branch: "5-0-stable"
 gem "graphql", "~> 1.9.0"
 gem "devise_token_auth", "< 1.2"
 gem "rspec-rails", "< 4.0"
+gem "factory_bot", "<= 6.4.4"
 
 gemspec path: "../"
diff --git a/gemfiles/rails5.1_graphql1.8.gemfile b/gemfiles/rails5.1_graphql1.8.gemfile
@@ -8,5 +8,6 @@ gem "graphql", "~> 1.8.0"
 gem "devise_token_auth", "0.1.43"
 gem "devise", ">= 4.3"
 gem "rspec-rails", "< 4.0"
+gem "factory_bot", "<= 6.4.4"
 
 gemspec path: "../"
diff --git a/gemfiles/rails5.1_graphql1.9.gemfile b/gemfiles/rails5.1_graphql1.9.gemfile
@@ -7,5 +7,6 @@ gem "rails", git: "https://github.com/rails/rails", branch: "5-1-stable"
 gem "graphql", "~> 1.9.0"
 gem "devise_token_auth", "< 1.2"
 gem "rspec-rails", "< 4.0"
+gem "factory_bot", "<= 6.4.4"
 
 gemspec path: "../"
diff --git a/gemfiles/rails5.2_graphql1.10.gemfile b/gemfiles/rails5.2_graphql1.10.gemfile
@@ -7,5 +7,6 @@ gem "rails", git: "https://github.com/rails/rails", branch: "5-2-stable"
 gem "graphql", "~> 1.10.0"
 gem "devise_token_auth", "< 1.2"
 gem "rspec-rails", "< 4.0"
+gem "factory_bot", "<= 6.4.4"
 
 gemspec path: "../"
diff --git a/gemfiles/rails5.2_graphql1.11.gemfile b/gemfiles/rails5.2_graphql1.11.gemfile
@@ -7,5 +7,6 @@ gem "rails", git: "https://github.com/rails/rails", branch: "5-2-stable"
 gem "graphql", "~> 1.11.0"
 gem "devise_token_auth", "< 1.2"
 gem "rspec-rails", "< 4.0"
+gem "factory_bot", "<= 6.4.4"
 
 gemspec path: "../"
diff --git a/gemfiles/rails5.2_graphql1.12.gemfile b/gemfiles/rails5.2_graphql1.12.gemfile
@@ -7,5 +7,6 @@ gem "rails", git: "https://github.com/rails/rails", branch: "5-2-stable"
 gem "graphql", "~> 1.12.0"
 gem "devise_token_auth", "< 1.2"
 gem "rspec-rails", "< 4.0"
+gem "factory_bot", "<= 6.4.4"
 
 gemspec path: "../"
diff --git a/gemfiles/rails5.2_graphql1.8.gemfile b/gemfiles/rails5.2_graphql1.8.gemfile
@@ -8,5 +8,6 @@ gem "graphql", "~> 1.8.0"
 gem "devise_token_auth", "0.1.43"
 gem "devise", ">= 4.4.2"
 gem "rspec-rails", "< 4.0"
+gem "factory_bot", "<= 6.4.4"
 
 gemspec path: "../"
diff --git a/gemfiles/rails5.2_graphql1.9.gemfile b/gemfiles/rails5.2_graphql1.9.gemfile
@@ -7,5 +7,6 @@ gem "rails", git: "https://github.com/rails/rails", branch: "5-2-stable"
 gem "graphql", "~> 1.9.0"
 gem "devise_token_auth", "< 1.2"
 gem "rspec-rails", "< 4.0"
+gem "factory_bot", "<= 6.4.4"
 
 gemspec path: "../"
diff --git a/gemfiles/rails6.0_graphql1.10.gemfile b/gemfiles/rails6.0_graphql1.10.gemfile
@@ -6,5 +6,6 @@ gem "sqlite3", "~> 1.5.4"
 gem "devise", ">= 4.7"
 gem "rails", git: "https://github.com/rails/rails", branch: "6-0-stable"
 gem "graphql", "~> 1.10.0"
+gem "factory_bot", "<= 6.4.4"
 
 gemspec path: "../"
diff --git a/gemfiles/rails6.0_graphql1.11.gemfile b/gemfiles/rails6.0_graphql1.11.gemfile
@@ -7,5 +7,6 @@ gem "public_suffix", "< 5"
 gem "devise", ">= 4.7"
 gem "rails", git: "https://github.com/rails/rails", branch: "6-0-stable"
 gem "graphql", "~> 1.11.0"
+gem "factory_bot", "<= 6.4.4"
 
 gemspec path: "../"
diff --git a/gemfiles/rails6.0_graphql1.12.gemfile b/gemfiles/rails6.0_graphql1.12.gemfile
@@ -7,5 +7,6 @@ gem "public_suffix", "< 5"
 gem "devise", ">= 4.7"
 gem "rails", git: "https://github.com/rails/rails", branch: "6-0-stable"
 gem "graphql", "~> 1.12.0"
+gem "factory_bot", "<= 6.4.4"
 
 gemspec path: "../"
diff --git a/gemfiles/rails6.0_graphql1.13.gemfile b/gemfiles/rails6.0_graphql1.13.gemfile
@@ -6,5 +6,6 @@ gem "sqlite3", "~> 1.5.4"
 gem "devise", ">= 4.7"
 gem "rails", git: "https://github.com/rails/rails", branch: "6-0-stable"
 gem "graphql", "~> 1.13.0"
+gem "factory_bot", "<= 6.4.4"
 
 gemspec path: "../"
diff --git a/gemfiles/rails6.1_graphql1.10.gemfile b/gemfiles/rails6.1_graphql1.10.gemfile
@@ -6,5 +6,6 @@ gem "sqlite3", "~> 1.5.4"
 gem "devise", ">= 4.7"
 gem "rails", git: "https://github.com/rails/rails", branch: "6-1-stable"
 gem "graphql", "~> 1.10.0"
+gem "factory_bot", "<= 6.4.4"
 
 gemspec path: "../"
diff --git a/gemfiles/rails6.1_graphql1.11.gemfile b/gemfiles/rails6.1_graphql1.11.gemfile
@@ -7,5 +7,6 @@ gem "public_suffix", "< 5"
 gem "devise", ">= 4.7"
 gem "rails", git: "https://github.com/rails/rails", branch: "6-1-stable"
 gem "graphql", "~> 1.11.0"
+gem "factory_bot", "<= 6.4.4"
 
 gemspec path: "../"
diff --git a/gemfiles/rails6.1_graphql1.12.gemfile b/gemfiles/rails6.1_graphql1.12.gemfile
@@ -7,5 +7,6 @@ gem "public_suffix", "< 5"
 gem "devise", ">= 4.7"
 gem "rails", git: "https://github.com/rails/rails", branch: "6-1-stable"
 gem "graphql", "~> 1.12.0"
+gem "factory_bot", "<= 6.4.4"
 
 gemspec path: "../"
diff --git a/gemfiles/rails6.1_graphql1.13.gemfile b/gemfiles/rails6.1_graphql1.13.gemfile
@@ -6,5 +6,6 @@ gem "sqlite3", "~> 1.5.4"
 gem "devise", ">= 4.7"
 gem "rails", git: "https://github.com/rails/rails", branch: "6-1-stable"
 gem "graphql", "~> 1.13.0"
+gem "factory_bot", "<= 6.4.4"
 
 gemspec path: "../"
diff --git a/gemfiles/rails6.1_graphql2.0.gemfile b/gemfiles/rails6.1_graphql2.0.gemfile
@@ -7,5 +7,6 @@ gem "sqlite3", "~> 1.5.4"
 gem "devise", ">= 4.7"
 gem "rails", git: "https://github.com/rails/rails", branch: "6-1-stable"
 gem "graphql", "~> 2.0.1"
+gem "factory_bot", "<= 6.4.4"
 
 gemspec path: "../"
diff --git a/gemfiles/rails7.0_graphql2.2.gemfile b/gemfiles/rails7.0_graphql2.2.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.2.0"
+
+gemspec path: "../"