Skip to content

Commit

Permalink
upgrades dummy to Rails 5.2 and adds 5.2 to Appraisals
Browse files Browse the repository at this point in the history
  • Loading branch information
jamesmk committed Apr 12, 2018
1 parent b5620b3 commit 8000e81
Show file tree
Hide file tree
Showing 6 changed files with 63 additions and 51 deletions.
4 changes: 4 additions & 0 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,7 @@ end
appraise 'rails_5_1' do
gem 'rails', '~> 5.1'
end

appraise 'rails_5_2' do
gem 'rails', '~> 5.2'
end
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ gemspec
# gem 'debugger'

# Set the version of Rails for the dummy app
gem 'rails', '~> 5.1.0'
gem 'rails', '~> 5.2.0'

# Lock in Rake to a version compatible with rspec-rails 3.0
gem 'rake', '< 12.0.0'
Expand Down
90 changes: 49 additions & 41 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -24,46 +24,50 @@ PATH
remotipart (~> 1.4.0)
sass (>= 3.4.0)
sass-rails (>= 5.0.7)
simple_form (~> 3.5.1)
simple_form (~> 4.0.0)
slim
uglifier

GEM
remote: https://rubygems.org/
specs:
actioncable (5.1.6)
actionpack (= 5.1.6)
actioncable (5.2.0)
actionpack (= 5.2.0)
nio4r (~> 2.0)
websocket-driver (~> 0.6.1)
actionmailer (5.1.6)
actionpack (= 5.1.6)
actionview (= 5.1.6)
activejob (= 5.1.6)
websocket-driver (>= 0.6.1)
actionmailer (5.2.0)
actionpack (= 5.2.0)
actionview (= 5.2.0)
activejob (= 5.2.0)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.1.6)
actionview (= 5.1.6)
activesupport (= 5.1.6)
actionpack (5.2.0)
actionview (= 5.2.0)
activesupport (= 5.2.0)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.1.6)
activesupport (= 5.1.6)
actionview (5.2.0)
activesupport (= 5.2.0)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.1.6)
activesupport (= 5.1.6)
activejob (5.2.0)
activesupport (= 5.2.0)
globalid (>= 0.3.6)
activemodel (5.1.6)
activesupport (= 5.1.6)
activerecord (5.1.6)
activemodel (= 5.1.6)
activesupport (= 5.1.6)
arel (~> 8.0)
activesupport (5.1.6)
activemodel (5.2.0)
activesupport (= 5.2.0)
activerecord (5.2.0)
activemodel (= 5.2.0)
activesupport (= 5.2.0)
arel (>= 9.0)
activestorage (5.2.0)
actionpack (= 5.2.0)
activerecord (= 5.2.0)
marcel (~> 0.3.1)
activesupport (5.2.0)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
Expand All @@ -78,7 +82,7 @@ GEM
bundler
rake
thor (>= 0.14.0)
arel (8.0.0)
arel (9.0.0)
bcrypt (3.1.11)
better_errors (2.4.0)
coderay (>= 1.0.0)
Expand Down Expand Up @@ -195,10 +199,13 @@ GEM
lumberjack (1.0.13)
mail (2.7.0)
mini_mime (>= 0.1.1)
marcel (0.3.2)
mimemagic (~> 0.3.2)
method_source (0.9.0)
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mimemagic (0.3.2)
mini_magick (4.8.0)
mini_mime (1.0.0)
mini_portile2 (2.3.0)
Expand All @@ -223,17 +230,18 @@ GEM
rack (2.0.4)
rack-test (1.0.0)
rack (>= 1.0, < 3)
rails (5.1.6)
actioncable (= 5.1.6)
actionmailer (= 5.1.6)
actionpack (= 5.1.6)
actionview (= 5.1.6)
activejob (= 5.1.6)
activemodel (= 5.1.6)
activerecord (= 5.1.6)
activesupport (= 5.1.6)
rails (5.2.0)
actioncable (= 5.2.0)
actionmailer (= 5.2.0)
actionpack (= 5.2.0)
actionview (= 5.2.0)
activejob (= 5.2.0)
activemodel (= 5.2.0)
activerecord (= 5.2.0)
activestorage (= 5.2.0)
activesupport (= 5.2.0)
bundler (>= 1.3.0)
railties (= 5.1.6)
railties (= 5.2.0)
sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.2)
actionpack (~> 5.x, >= 5.0.1)
Expand All @@ -245,9 +253,9 @@ GEM
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
rails-perftest (0.0.7)
railties (5.1.6)
actionpack (= 5.1.6)
activesupport (= 5.1.6)
railties (5.2.0)
actionpack (= 5.2.0)
activesupport (= 5.2.0)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
Expand Down Expand Up @@ -302,9 +310,9 @@ GEM
shellany (0.0.1)
shoulda-matchers (3.1.2)
activesupport (>= 4.0.0)
simple_form (3.5.1)
actionpack (> 4, < 5.2)
activemodel (> 4, < 5.2)
simple_form (4.0.0)
actionpack (> 4)
activemodel (> 4)
slim (3.0.9)
temple (>= 0.7.6, < 0.9)
tilt (>= 1.3.3, < 2.1)
Expand Down Expand Up @@ -333,7 +341,7 @@ GEM
warden (1.2.7)
rack (>= 1.0)
websocket (1.0.7)
websocket-driver (0.6.5)
websocket-driver (0.7.0)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.3)
xpath (2.1.0)
Expand All @@ -360,7 +368,7 @@ DEPENDENCIES
guard-rspec (~> 4.7.3)
mysql2
pry
rails (~> 5.1.0)
rails (~> 5.2.0)
rails-controller-testing
rails-perftest
rake (< 12.0.0)
Expand Down
2 changes: 1 addition & 1 deletion fae.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Gem::Specification.new do |s|
s.add_dependency 'judge-simple_form', '~> 1.0.0'
s.add_dependency 'kaminari', '~> 1.1.1'
s.add_dependency 'remotipart', '~> 1.4.0'
s.add_dependency 'simple_form', '~> 3.5.1'
s.add_dependency 'simple_form', '~> 4.0.0'
s.add_dependency 'slim'

s.add_development_dependency 'appraisal'
Expand Down
8 changes: 4 additions & 4 deletions gemfiles/rails_5_0.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ PATH
remotipart (~> 1.4.0)
sass (>= 3.4.0)
sass-rails (>= 5.0.7)
simple_form (~> 3.5.1)
simple_form (~> 4.0.0)
slim
uglifier

Expand Down Expand Up @@ -302,9 +302,9 @@ GEM
shellany (0.0.1)
shoulda-matchers (3.1.2)
activesupport (>= 4.0.0)
simple_form (3.5.1)
actionpack (> 4, < 5.2)
activemodel (> 4, < 5.2)
simple_form (4.0.0)
actionpack (> 4)
activemodel (> 4)
slim (3.0.9)
temple (>= 0.7.6, < 0.9)
tilt (>= 1.3.3, < 2.1)
Expand Down
8 changes: 4 additions & 4 deletions gemfiles/rails_5_1.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ PATH
remotipart (~> 1.4.0)
sass (>= 3.4.0)
sass-rails (>= 5.0.7)
simple_form (~> 3.5.1)
simple_form (~> 4.0.0)
slim
uglifier

Expand Down Expand Up @@ -302,9 +302,9 @@ GEM
shellany (0.0.1)
shoulda-matchers (3.1.2)
activesupport (>= 4.0.0)
simple_form (3.5.1)
actionpack (> 4, < 5.2)
activemodel (> 4, < 5.2)
simple_form (4.0.0)
actionpack (> 4)
activemodel (> 4)
slim (3.0.9)
temple (>= 0.7.6, < 0.9)
tilt (>= 1.3.3, < 2.1)
Expand Down

0 comments on commit 8000e81

Please sign in to comment.