Skip to content

Commit 85086a0

Browse files
Merge pull request #72 from graphql-devise/use-rspec-4.0
Use RSpec 4.0 for Rails >= 6.0 builds
2 parents e0e0ae8 + 0cae89d commit 85086a0

10 files changed

Lines changed: 17 additions & 1 deletion

Appraisals

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ appraise 'rails4.2-graphql1.8' do
33
gem 'bundler', '~> 1.17'
44
gem 'rails', github: 'rails/rails', branch: '4-2-stable'
55
gem 'graphql', '~> 1.8.0'
6+
gem 'rspec-rails', '< 4.0'
67
end
78

89
appraise 'rails5.0-graphql1.8' do
@@ -11,12 +12,14 @@ appraise 'rails5.0-graphql1.8' do
1112
gem 'graphql', '~> 1.8.0'
1213
gem 'devise_token_auth', '0.1.43'
1314
gem 'devise', '>= 4.0'
15+
gem 'rspec-rails', '< 4.0'
1416
end
1517

1618
appraise 'rails5.0-graphql1.9' do
1719
gem 'sqlite3', '~> 1.3.6'
1820
gem 'rails', github: 'rails/rails', branch: '5-0-stable'
1921
gem 'graphql', '~> 1.9.0'
22+
gem 'rspec-rails', '< 4.0'
2023
end
2124

2225
appraise 'rails5.1-graphql1.8' do
@@ -25,12 +28,14 @@ appraise 'rails5.1-graphql1.8' do
2528
gem 'graphql', '~> 1.8.0'
2629
gem 'devise_token_auth', '0.1.43'
2730
gem 'devise', '>= 4.3'
31+
gem 'rspec-rails', '< 4.0'
2832
end
2933

3034
appraise 'rails5.1-graphql1.9' do
3135
gem 'sqlite3', '~> 1.3.6'
3236
gem 'rails', github: 'rails/rails', branch: '5-1-stable'
3337
gem 'graphql', '~> 1.9.0'
38+
gem 'rspec-rails', '< 4.0'
3439
end
3540

3641
appraise 'rails5.2-graphql1.8' do
@@ -39,18 +44,21 @@ appraise 'rails5.2-graphql1.8' do
3944
gem 'graphql', '~> 1.8.0'
4045
gem 'devise_token_auth', '0.1.43'
4146
gem 'devise', '>= 4.4.2'
47+
gem 'rspec-rails', '< 4.0'
4248
end
4349

4450
appraise 'rails5.2-graphql1.9' do
4551
gem 'sqlite3', '~> 1.3.6'
4652
gem 'rails', github: 'rails/rails', branch: '5-2-stable'
4753
gem 'graphql', '~> 1.9.0'
54+
gem 'rspec-rails', '< 4.0'
4855
end
4956

5057
appraise 'rails5.2-graphql1.10' do
5158
gem 'sqlite3', '~> 1.3.6'
5259
gem 'rails', github: 'rails/rails', branch: '5-2-stable'
5360
gem 'graphql', '~> 1.10.0'
61+
gem 'rspec-rails', '< 4.0'
5462
end
5563

5664
appraise 'rails6.0-graphql1.8' do

gemfiles/rails4.2_graphql1.8.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@ gem "sqlite3", "~> 1.3.6"
66
gem "bundler", "~> 1.17"
77
gem "rails", github: "rails/rails", branch: "4-2-stable"
88
gem "graphql", "~> 1.8.0"
9+
gem "rspec-rails", "< 4.0"
910

1011
gemspec path: "../"

gemfiles/rails5.0_graphql1.8.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@ gem "rails", github: "rails/rails", branch: "5-0-stable"
77
gem "graphql", "~> 1.8.0"
88
gem "devise_token_auth", "0.1.43"
99
gem "devise", ">= 4.0"
10+
gem "rspec-rails", "< 4.0"
1011

1112
gemspec path: "../"

gemfiles/rails5.0_graphql1.9.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@ source "https://rubygems.org"
55
gem "sqlite3", "~> 1.3.6"
66
gem "rails", github: "rails/rails", branch: "5-0-stable"
77
gem "graphql", "~> 1.9.0"
8+
gem "rspec-rails", "< 4.0"
89

910
gemspec path: "../"

gemfiles/rails5.1_graphql1.8.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@ gem "rails", github: "rails/rails", branch: "5-1-stable"
77
gem "graphql", "~> 1.8.0"
88
gem "devise_token_auth", "0.1.43"
99
gem "devise", ">= 4.3"
10+
gem "rspec-rails", "< 4.0"
1011

1112
gemspec path: "../"

gemfiles/rails5.1_graphql1.9.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@ source "https://rubygems.org"
55
gem "sqlite3", "~> 1.3.6"
66
gem "rails", github: "rails/rails", branch: "5-1-stable"
77
gem "graphql", "~> 1.9.0"
8+
gem "rspec-rails", "< 4.0"
89

910
gemspec path: "../"

gemfiles/rails5.2_graphql1.10.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@ source "https://rubygems.org"
55
gem "sqlite3", "~> 1.3.6"
66
gem "rails", github: "rails/rails", branch: "5-2-stable"
77
gem "graphql", "~> 1.10.0"
8+
gem "rspec-rails", "< 4.0"
89

910
gemspec path: "../"

gemfiles/rails5.2_graphql1.8.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@ gem "rails", github: "rails/rails", branch: "5-2-stable"
77
gem "graphql", "~> 1.8.0"
88
gem "devise_token_auth", "0.1.43"
99
gem "devise", ">= 4.4.2"
10+
gem "rspec-rails", "< 4.0"
1011

1112
gemspec path: "../"

gemfiles/rails5.2_graphql1.9.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@ source "https://rubygems.org"
55
gem "sqlite3", "~> 1.3.6"
66
gem "rails", github: "rails/rails", branch: "5-2-stable"
77
gem "graphql", "~> 1.9.0"
8+
gem "rspec-rails", "< 4.0"
89

910
gemspec path: "../"

graphql_devise.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Gem::Specification.new do |spec|
3838
spec.add_development_dependency 'pry', '~> 0.12.2'
3939
spec.add_development_dependency 'pry-byebug'
4040
spec.add_development_dependency 'rake', '>= 12.3.3'
41-
spec.add_development_dependency 'rspec-rails'
41+
spec.add_development_dependency 'rspec-rails', '~> 4.0'
4242
spec.add_development_dependency 'rubocop', '0.68.1'
4343
spec.add_development_dependency 'rubocop-performance'
4444
spec.add_development_dependency 'rubocop-rspec'

0 commit comments

Comments
 (0)