Skip to content
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.

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

Deprecation for ruby 2.4 removed #1040

Closed
wants to merge 53 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
89c90a9
Typo fix
ojab Dec 25, 2015
4b92350
Replace Fixnum with Integer
dorobica Apr 13, 2017
7c0a323
Add Rails 5 appraisal
mcmire Sep 4, 2016
0f4093a
Exclude Ruby 2.0 and 2.1 from Rails 5.0 jobs in Travis CI
Apr 19, 2017
f7022ec
Add specific ruby versions so Travis CI downloads the right rvm binaries
Apr 19, 2017
e5178ab
Exclude Ruby 2.3 from Rails 4.0.x jobs in Travis CI
Apr 19, 2017
ed2ca66
capture, silence_stream, and silence_stderr were removed in Rails 5
mcmire Sep 4, 2016
51d97a5
Don't require ActiveResource tests under Rails 5
mcmire Sep 4, 2016
54c7f19
Don't protect attributes under Rails 5
mcmire Sep 4, 2016
b33f6c4
Fetch pry gem using HTTPS
Apr 19, 2017
4d2b6e3
Add rails-controller-testing gem to rails 5.0 tests
Apr 19, 2017
738b0b3
Update appraisal to rails 5.0.2
Apr 19, 2017
558dbd9
Add jbuilder to rails 4.2 and 5.0 tests
Apr 19, 2017
43437c4
Fix multi-line block code style
Apr 23, 2017
9be4dd7
Merge pull request #1013 from guialbuk/travis-rails-5
Apr 23, 2017
a9c364b
Fix #tables deprecation in Rails 5.0 and keep compatibility with Rail…
Jun 28, 2016
7239d1f
Merge pull request #943 from guialbuk/fix-933
Apr 23, 2017
ead8701
Merge pull request #1015 from thoughtbot/master
Apr 25, 2017
bddd83b
Add missing json dependency for rdoc in Rails 4.1 and 4.2 failing in …
Jul 5, 2017
56f8b62
Update Rails versions to 5.0.4 and 4.2.9
Jul 5, 2017
217df69
Add Ruby 2.4 tests to TravisCI for Rails 4.2.9 and 5.0.4
Jul 5, 2017
72c850b
Fix dependecies for different Ruby versions
Jul 5, 2017
0f33e07
Merge pull request #1027 from guialbuk/update-ci-rails-versions
Jul 5, 2017
df085c2
Merge pull request #1009 from dorobica/hotfix/fixnum-deprecation
Jul 5, 2017
f800d62
Merge pull request #1028 from thoughtbot/typo-fix
Jul 5, 2017
e94d623
Remove TravisCI support for Ruby 2.0 and 2.1 and Rails 4.0 and 4.1
Jul 5, 2017
abf4ccd
Require Ruby >= 2.2.0 and Rails >=2.4.0 in gemspec
Jul 12, 2017
7551317
Merge pull request #1032 from guialbuk/drop-support-for-deprecated-ru…
Jul 12, 2017
65eac65
Update ruby versions to 2.2.7 and 2.3.4 in TravisCI
Jul 12, 2017
0b2e0da
Merge pull request #1033 from guialbuk/update-travisci-ruby-versions
Jul 12, 2017
8c59e8b
Update zeus & pry so that we can use Zeus again
mcmire Jul 25, 2017
2dfd855
Update rspec & rspec-rails to 3.6.x
mcmire Jul 25, 2017
323c5ad
Remove warning from Ruby in AllowValueMatcher
mcmire Jul 25, 2017
588492f
Disable allow_mass_assignment_of tests under Rails 5
mcmire Jul 25, 2017
7ac1e48
Don't autorequire Zeus when loading Rails for tests
mcmire Jul 25, 2017
a9570b8
Remove typo
mcmire Jul 25, 2017
c6010df
Rails 5: Fix built-in-test custom models w/ attrs
mcmire Jul 25, 2017
c6d0ac5
Rails 5: Fix validate_inclusion_of tests
mcmire Jul 25, 2017
28a43a3
Fix #913 for Serialize Matcher error undefined method `cast_type' in …
bsodmike Oct 18, 2016
e58bb39
Rails 5: Fix uniqueness tests to not use attr_accessible
mcmire Jul 25, 2017
3e745be
Get rid of some warnings from Ruby
mcmire Jul 25, 2017
4771bb8
Rails 5: Fix failing association matcher tests
mcmire Jul 25, 2017
e0e48bb
Doublespeak: Remove usage of deprecated RSpec #ordered method
mcmire Jul 25, 2017
2166c9c
Squiggly heredoc is not supported in Ruby 2.2
mcmire Jul 25, 2017
908fac1
Add missing gems to 5.0 Appraisal
mcmire Jul 25, 2017
a53373b
Add more missing gems to 5.0 appraisal
mcmire Jul 25, 2017
8d686d7
Remove some more warnings coming from Ruby
mcmire Jul 25, 2017
d0c0329
Doublespeak: Define #respond_to_missing? on ObjectDouble
mcmire Jul 25, 2017
e58e689
Hound
mcmire Jul 25, 2017
71db17a
Deprecation for ruby 2.4 removed
dima4p Jul 25, 2017
95b6ec4
Allow failure of Rails 5.0 builds during v4.0 development
Jul 31, 2017
8fcbdb0
Merge pull request #1047 from guialbuk/allow-rails-5-ci-to-fail
Jul 31, 2017
ff50c57
Merge branch 'rails-5' into master
Jul 31, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 8 additions & 6 deletions .travis.yml
Expand Up @@ -8,12 +8,14 @@ env:
- DATABASE_ADAPTER=postgresql

rvm:
- 2.0
- 2.1
- 2.2
- 2.4.1
- 2.3.4
- 2.2.7

gemfile:
- gemfiles/4.0.0.gemfile
- gemfiles/4.0.1.gemfile
- gemfiles/4.1.gemfile
- gemfiles/4.2.gemfile
- gemfiles/5.0.gemfile

matrix:
allow_failures:
- gemfile: gemfiles/5.0.gemfile
62 changes: 21 additions & 41 deletions Appraisals
@@ -1,7 +1,5 @@
ruby_version = Gem::Version.new(RUBY_VERSION + '')

shared_dependencies = proc do
gem 'rspec-rails', '>= 3.2.0', '< 4'
gem 'rspec-rails', '~> 3.6'
gem 'shoulda-context', '~> 1.2.0'
gem 'sqlite3', platform: :ruby
gem 'pg', platform: :ruby
Expand All @@ -17,57 +15,39 @@ spring = proc do
gem 'spring-commands-rspec'
end

rails_4 = proc do
appraise '4.2' do
instance_eval(&shared_dependencies)
instance_eval(&spring)
gem 'uglifier', '>= 1.3.0'
gem 'coffee-rails', '~> 4.0.0'
gem 'jquery-rails'
gem 'turbolinks'
gem 'turbolinks', '2.5.3'
gem 'sdoc'
gem 'json', '~> 1.4'
gem 'activeresource', '4.0.0'
# Test suite makes heavy use of attr_accessible
gem 'protected_attributes'
gem 'minitest-reporters'
end

#---

appraise '4.0.0' do
instance_eval(&rails_4)
gem 'rails', '4.0.0'
gem 'jbuilder', '~> 1.2'
gem 'sass-rails', '~> 4.0.0'
gem 'bcrypt-ruby', '~> 3.0.0'
end

appraise '4.0.1' do
instance_eval(&rails_4)
gem 'rails', '4.0.1'
gem 'jbuilder', '~> 1.2'
gem 'sass-rails', '~> 4.0.0'
gem 'bcrypt-ruby', '~> 3.1.2'
end

appraise '4.1' do
instance_eval(&rails_4)
gem 'rails', '~> 4.1.0'
gem 'rails', '~> 4.2.9'
gem 'sass-rails', '~> 5.0'
gem 'coffee-rails', '~> 4.1.0'
gem 'jbuilder', '~> 2.0'
gem 'sass-rails', '~> 4.0.3'
gem 'sdoc', '~> 0.4.0'
gem 'nokogiri', '~> 1.8'
gem 'bcrypt', '~> 3.1.7'
gem 'protected_attributes', "~> 1.0.6"
gem 'spring'
end

appraise '4.2' do
instance_eval(&rails_4)
gem 'rails', '~> 4.2.0'
appraise '5.0' do
instance_eval(&shared_dependencies)
instance_eval(&spring)
gem 'rails', '~> 5.0.4'
gem 'rails-controller-testing', '>= 1.0.1'
gem 'puma', '~> 3.0'
gem 'sass-rails', '~> 5.0'
gem 'coffee-rails', '~> 4.1.0'
gem 'jbuilder', '~> 2.0'
gem 'sdoc', '~> 0.4.0'
gem 'jquery-rails'
gem 'turbolinks', '~> 5'
gem 'jbuilder', '~> 2.5'
gem 'bcrypt', '~> 3.1.7'
gem 'spring'
gem 'protected_attributes', "~> 1.0.6"
gem 'listen', '~> 3.0.5'
gem 'spring-watcher-listen', '~> 2.0.0'
gem 'nokogiri', '~> 1.8'
gem 'minitest-reporters'
end
8 changes: 4 additions & 4 deletions Gemfile
@@ -1,12 +1,12 @@
source 'https://rubygems.org'

gem 'appraisal', '~> 2.0'
gem 'appraisal', '2.1.0'
gem 'bundler', '~> 1.1'
gem 'pry', git: 'https://github.com/pry/pry.git'
gem 'pry'
gem 'pry-byebug'
gem 'rake', '>= 10.5.0', '< 11'
gem 'rspec', '~> 3.2'
gem 'zeus'
gem 'rspec', '~> 3.6'
gem 'zeus', require: false

# YARD
gem 'yard'
Expand Down
47 changes: 22 additions & 25 deletions Gemfile.lock
@@ -1,11 +1,3 @@
GIT
remote: https://github.com/pry/pry.git
revision: 1f64463184e0a160d0b41d1a1f92b8e2f230278c
specs:
pry (0.10.4)
coderay (~> 1.1.0)
method_source (~> 0.8.1)

GEM
remote: https://rubygems.org/
specs:
Expand All @@ -15,50 +7,55 @@ GEM
thor (>= 0.14.0)
byebug (9.0.6)
coderay (1.1.1)
diff-lcs (1.2.5)
diff-lcs (1.3)
fssm (0.2.10)
method_source (0.8.2)
multi_json (1.12.1)
pry (0.10.4)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
pry-byebug (3.4.2)
byebug (~> 9.0)
pry (~> 0.10)
pygments.rb (1.1.1)
multi_json (>= 1.0.0)
rake (10.5.0)
redcarpet (3.4.0)
rspec (3.5.0)
rspec-core (~> 3.5.0)
rspec-expectations (~> 3.5.0)
rspec-mocks (~> 3.5.0)
rspec-core (3.5.4)
rspec-support (~> 3.5.0)
rspec-expectations (3.5.0)
rspec (3.6.0)
rspec-core (~> 3.6.0)
rspec-expectations (~> 3.6.0)
rspec-mocks (~> 3.6.0)
rspec-core (3.6.0)
rspec-support (~> 3.6.0)
rspec-expectations (3.6.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.5.0)
rspec-mocks (3.5.0)
rspec-support (~> 3.6.0)
rspec-mocks (3.6.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.5.0)
rspec-support (3.5.0)
rspec-support (~> 3.6.0)
rspec-support (3.6.0)
slop (3.6.0)
thor (0.19.4)
yard (0.9.6)
zeus (0.15.12)
zeus (0.15.14)
method_source (>= 0.6.7)

PLATFORMS
ruby

DEPENDENCIES
appraisal (~> 2.0)
appraisal (= 2.1.0)
bundler (~> 1.1)
fssm
pry!
pry
pry-byebug
pygments.rb
rake (>= 10.5.0, < 11)
redcarpet
rspec (~> 3.2)
rspec (~> 3.6)
yard
zeus

BUNDLED WITH
1.13.6
1.14.6
38 changes: 0 additions & 38 deletions gemfiles/4.0.0.gemfile

This file was deleted.