Skip to content

Fix compatibility issues with rspec-rails #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mcmire merged 1 commit into from
Feb 10, 2021
Merged

Fix compatibility issues with rspec-rails #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
45 changes: 38 additions & 7 deletions Appraisals
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,32 +8,56 @@ appraisals = {
instance_eval(&rails_dependencies)

gem "activerecord", "~> 5.0.0"
gem "railties", "~> 5.0.0"
gem "sqlite3", "~> 1.3.6", platform: [:ruby, :mswin, :mingw]
},
rails_5_1: proc {
instance_eval(&rails_dependencies)

gem "activerecord", "~> 5.1.0"
gem "railties", "~> 5.1.0"
gem "sqlite3", "~> 1.3.6", platform: [:ruby, :mswin, :mingw]
},
rails_5_2: proc {
instance_eval(&rails_dependencies)

gem "activerecord", "~> 5.2.0"
gem "railties", "~> 5.2.0"
gem "sqlite3", "~> 1.3.6", platform: [:ruby, :mswin, :mingw]
},
rails_6_0: proc {
instance_eval(&rails_dependencies)

gem "activerecord", "~> 6.0"
gem "railties", "~> 6.0"
gem "sqlite3", "~> 1.4.0", platform: [:ruby, :mswin, :mingw]
},
no_rails: proc {},
rspec_lt_3_10: proc {
gem "rspec", "< 3.10"
rspec_lt_3_10: proc { |with_rails|
version = "< 3.10"

if with_rails
gem "rspec-core", version
gem "rspec-expectations", version
gem "rspec-mocks", version
gem "rspec-support", version
gem "rspec-rails"
else
gem "rspec", version
end
},
rspec_gte_3_10: proc {
gem "rspec", ">= 3.10", "< 4"
rspec_gte_3_10: proc { |with_rails|
version = [">= 3.10", "< 4"]

if with_rails
gem "rspec-core", *version
gem "rspec-expectations", *version
gem "rspec-mocks", *version
gem "rspec-support", *version
gem "rspec-rails"
else
gem "rspec", *version
end
},
}

Expand All @@ -54,9 +78,16 @@ rspec_appraisals = [

rails_appraisals.each do |rails_appraisal|
rspec_appraisals.each do |rspec_appraisal|
appraise "#{rails_appraisal}_#{rspec_appraisal}" do
instance_eval(&appraisals.fetch(rails_appraisal))
instance_eval(&appraisals.fetch(rspec_appraisal))
if rails_appraisal == :no_rails
appraise "#{rails_appraisal}_#{rspec_appraisal}" do
instance_eval(&appraisals.fetch(rails_appraisal))
instance_exec(false, &appraisals.fetch(rspec_appraisal))
end
else
appraise "#{rails_appraisal}_#{rspec_appraisal}" do
instance_eval(&appraisals.fetch(rails_appraisal))
instance_exec(true, &appraisals.fetch(rspec_appraisal))
end
end
end
end
7 changes: 6 additions & 1 deletion gemfiles/rails_5_0_rspec_gte_3_10.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,12 @@ gem "rubocop"
gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
gem "jdbc-sqlite3", platform: :jruby
gem "activerecord", "~> 5.0.0"
gem "railties", "~> 5.0.0"
gem "sqlite3", "~> 1.3.6", platform: [:ruby, :mswin, :mingw]
gem "rspec", ">= 3.10", "< 4"
gem "rspec-core", ">= 3.10", "< 4"
gem "rspec-expectations", ">= 3.10", "< 4"
gem "rspec-mocks", ">= 3.10", "< 4"
gem "rspec-support", ">= 3.10", "< 4"
gem "rspec-rails"

gemspec path: "../"
55 changes: 50 additions & 5 deletions gemfiles/rails_5_0_rspec_gte_3_10.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,19 @@ PATH
GEM
remote: https://rubygems.org/
specs:
actionpack (5.0.7.2)
actionview (= 5.0.7.2)
activesupport (= 5.0.7.2)
rack (~> 2.0)
rack-test (~> 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.0.7.2)
activesupport (= 5.0.7.2)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activemodel (5.0.7.2)
activesupport (= 5.0.7.2)
activerecord (5.0.7.2)
Expand All @@ -27,15 +40,24 @@ GEM
arel (7.1.4)
ast (2.4.1)
attr_extras (6.2.4)
builder (3.2.4)
byebug (11.1.3)
childprocess (4.0.0)
coderay (1.1.3)
concurrent-ruby (1.1.7)
crass (1.0.6)
diff-lcs (1.4.4)
erubis (2.7.0)
i18n (1.8.5)
concurrent-ruby (~> 1.0)
loofah (2.7.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
method_source (1.0.0)
mini_portile2 (2.4.0)
minitest (5.14.2)
nokogiri (1.10.10)
mini_portile2 (~> 2.4.0)
parallel (1.19.2)
parser (2.7.1.4)
ast (~> 2.4.1)
Expand All @@ -47,14 +69,24 @@ GEM
pry-byebug (3.9.0)
byebug (~> 11.0)
pry (~> 0.13.0)
rack (2.2.3)
rack-test (0.6.3)
rack (>= 1.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
railties (5.0.7.2)
actionpack (= 5.0.7.2)
activesupport (= 5.0.7.2)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (3.0.0)
rake (13.0.1)
regexp_parser (1.7.1)
rexml (3.2.4)
rspec (3.10.0)
rspec-core (~> 3.10.0)
rspec-expectations (~> 3.10.0)
rspec-mocks (~> 3.10.0)
rspec-core (3.10.0)
rspec-support (~> 3.10.0)
rspec-expectations (3.10.0)
Expand All @@ -63,6 +95,14 @@ GEM
rspec-mocks (3.10.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.10.0)
rspec-rails (4.0.1)
actionpack (>= 4.2)
activesupport (>= 4.2)
railties (>= 4.2)
rspec-core (~> 3.9)
rspec-expectations (~> 3.9)
rspec-mocks (~> 3.9)
rspec-support (~> 3.9)
rspec-support (3.10.0)
rubocop (0.89.1)
parallel (~> 1.10)
Expand Down Expand Up @@ -95,8 +135,13 @@ DEPENDENCIES
jdbc-sqlite3
pry-byebug
pry-nav
railties (~> 5.0.0)
rake
rspec (>= 3.10, < 4)
rspec-core (>= 3.10, < 4)
rspec-expectations (>= 3.10, < 4)
rspec-mocks (>= 3.10, < 4)
rspec-rails
rspec-support (>= 3.10, < 4)
rubocop
sqlite3 (~> 1.3.6)
super_diff!
Expand Down
7 changes: 6 additions & 1 deletion gemfiles/rails_5_0_rspec_lt_3_10.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,12 @@ gem "rubocop"
gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
gem "jdbc-sqlite3", platform: :jruby
gem "activerecord", "~> 5.0.0"
gem "railties", "~> 5.0.0"
gem "sqlite3", "~> 1.3.6", platform: [:ruby, :mswin, :mingw]
gem "rspec", "< 3.10"
gem "rspec-core", "< 3.10"
gem "rspec-expectations", "< 3.10"
gem "rspec-mocks", "< 3.10"
gem "rspec-support", "< 3.10"
gem "rspec-rails"

gemspec path: "../"
55 changes: 50 additions & 5 deletions gemfiles/rails_5_0_rspec_lt_3_10.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,19 @@ PATH
GEM
remote: https://rubygems.org/
specs:
actionpack (5.0.7.2)
actionview (= 5.0.7.2)
activesupport (= 5.0.7.2)
rack (~> 2.0)
rack-test (~> 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.0.7.2)
activesupport (= 5.0.7.2)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activemodel (5.0.7.2)
activesupport (= 5.0.7.2)
activerecord (5.0.7.2)
Expand All @@ -27,15 +40,24 @@ GEM
arel (7.1.4)
ast (2.4.1)
attr_extras (6.2.4)
builder (3.2.4)
byebug (11.1.3)
childprocess (4.0.0)
coderay (1.1.3)
concurrent-ruby (1.1.7)
crass (1.0.6)
diff-lcs (1.4.4)
erubis (2.7.0)
i18n (1.8.5)
concurrent-ruby (~> 1.0)
loofah (2.7.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
method_source (1.0.0)
mini_portile2 (2.4.0)
minitest (5.14.2)
nokogiri (1.10.10)
mini_portile2 (~> 2.4.0)
parallel (1.19.2)
parser (2.7.1.4)
ast (~> 2.4.1)
Expand All @@ -47,14 +69,24 @@ GEM
pry-byebug (3.9.0)
byebug (~> 11.0)
pry (~> 0.13.0)
rack (2.2.3)
rack-test (0.6.3)
rack (>= 1.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
railties (5.0.7.2)
actionpack (= 5.0.7.2)
activesupport (= 5.0.7.2)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (3.0.0)
rake (13.0.1)
regexp_parser (1.7.1)
rexml (3.2.4)
rspec (3.9.0)
rspec-core (~> 3.9.0)
rspec-expectations (~> 3.9.0)
rspec-mocks (~> 3.9.0)
rspec-core (3.9.2)
rspec-support (~> 3.9.3)
rspec-expectations (3.9.2)
Expand All @@ -63,6 +95,14 @@ GEM
rspec-mocks (3.9.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.9.0)
rspec-rails (4.0.1)
actionpack (>= 4.2)
activesupport (>= 4.2)
railties (>= 4.2)
rspec-core (~> 3.9)
rspec-expectations (~> 3.9)
rspec-mocks (~> 3.9)
rspec-support (~> 3.9)
rspec-support (3.9.3)
rubocop (0.89.1)
parallel (~> 1.10)
Expand Down Expand Up @@ -95,8 +135,13 @@ DEPENDENCIES
jdbc-sqlite3
pry-byebug
pry-nav
railties (~> 5.0.0)
rake
rspec (< 3.10)
rspec-core (< 3.10)
rspec-expectations (< 3.10)
rspec-mocks (< 3.10)
rspec-rails
rspec-support (< 3.10)
rubocop
sqlite3 (~> 1.3.6)
super_diff!
Expand Down
7 changes: 6 additions & 1 deletion gemfiles/rails_5_1_rspec_gte_3_10.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,12 @@ gem "rubocop"
gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
gem "jdbc-sqlite3", platform: :jruby
gem "activerecord", "~> 5.1.0"
gem "railties", "~> 5.1.0"
gem "sqlite3", "~> 1.3.6", platform: [:ruby, :mswin, :mingw]
gem "rspec", ">= 3.10", "< 4"
gem "rspec-core", ">= 3.10", "< 4"
gem "rspec-expectations", ">= 3.10", "< 4"
gem "rspec-mocks", ">= 3.10", "< 4"
gem "rspec-support", ">= 3.10", "< 4"
gem "rspec-rails"

gemspec path: "../"
Loading