Skip to content

Commit

Permalink
Rails & RSpec update (#202)
Browse files Browse the repository at this point in the history
* Force SSL

* Messy, partial rails upgrade

* Fix tests

* Upgrade to latest 4.2

* Fix activity feed time parsing

* Remove leftover debug statement

* Initial rspec 3 upgrade

Tests passing, lots of deprecations.

* Convert should to expect

* Fix a bunch more deprecations

* Fix and update language-specific tests

* Fix RSpec stub_chain deprecation

* Fix issue with RSpec loading in production

* Rails 4.2 defaults for prod config

* Feature fixes

* Update TravisCI (#3)

Update TravisCI config

* Consider non-"ok" tests failing

This fixes an issue where a thread fails and prints messages.

* Fix logout link

* Fix spacing
  • Loading branch information
AndrewRadev committed Feb 8, 2020
1 parent f1d83e5 commit 8028f5f
Show file tree
Hide file tree
Showing 133 changed files with 1,366 additions and 1,384 deletions.
1 change: 0 additions & 1 deletion .ruby-version

This file was deleted.

2 changes: 1 addition & 1 deletion .travis.yml
@@ -1,6 +1,6 @@
language: ruby
rvm:
- 2.3.1
- 2.6
script:
- RAILS_ENV=test bundle exec rake --trace db:create db:migrate db:test:prepare spec cucumber
before_install:
Expand Down
6 changes: 3 additions & 3 deletions Gemfile
@@ -1,6 +1,6 @@
source 'http://rubygems.org'

gem 'rails', '~> 4.1.0'
gem 'rails', '4.2.11'
gem 'rake', '< 11.0'

gem 'pg'
Expand Down Expand Up @@ -47,7 +47,7 @@ group :assets do
end

group :development, :test do
gem 'rspec-rails', '~> 2.14'
gem 'rspec-rails', '~> 3.1.0'
gem 'factory_girl_rails'
gem 'faker'
end
Expand Down Expand Up @@ -79,5 +79,5 @@ group :test do
end

group :tasks do
gem 'rspec'
gem 'rspec', '3.1'
end
183 changes: 106 additions & 77 deletions Gemfile.lock
@@ -1,36 +1,44 @@
GEM
remote: http://rubygems.org/
specs:
actionmailer (4.1.16)
actionpack (= 4.1.16)
actionview (= 4.1.16)
actionmailer (4.2.11)
actionpack (= 4.2.11)
actionview (= 4.2.11)
activejob (= 4.2.11)
mail (~> 2.5, >= 2.5.4)
actionpack (4.1.16)
actionview (= 4.1.16)
activesupport (= 4.1.16)
rack (~> 1.5.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.11)
actionview (= 4.2.11)
activesupport (= 4.2.11)
rack (~> 1.6)
rack-test (~> 0.6.2)
actionview (4.1.16)
activesupport (= 4.1.16)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (4.2.11)
activesupport (= 4.2.11)
builder (~> 3.1)
erubis (~> 2.7.0)
activemodel (4.1.16)
activesupport (= 4.1.16)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (4.2.11)
activesupport (= 4.2.11)
globalid (>= 0.3.0)
activemodel (4.2.11)
activesupport (= 4.2.11)
builder (~> 3.1)
activerecord (4.1.16)
activemodel (= 4.1.16)
activesupport (= 4.1.16)
arel (~> 5.0.0)
activesupport (4.1.16)
i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7)
activerecord (4.2.11)
activemodel (= 4.2.11)
activesupport (= 4.2.11)
arel (~> 6.0)
activesupport (4.2.11)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.3.8)
arel (5.0.1.20140414130214)
arel (6.0.4)
ast (2.3.0)
bcrypt (3.1.10)
bcrypt (3.1.12)
builder (3.2.3)
capistrano (2.15.6)
highline
Expand All @@ -52,20 +60,22 @@ GEM
celluloid (0.15.2)
timers (~> 1.1.0)
coderay (1.1.0)
coffee-rails (4.1.0)
coffee-rails (4.2.2)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.0)
railties (>= 4.0.0)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.9.1.1)
coffee-script-source (1.12.2)
concurrent-ruby (1.1.5)
connection_pool (2.2.0)
coveralls (0.8.2)
json (~> 1.8)
rest-client (>= 1.6.8, < 2)
simplecov (~> 0.10.0)
term-ansicolor (~> 1.3)
thor (~> 0.19.1)
crass (1.0.5)
cucumber (1.3.20)
builder (>= 2.1.2)
diff-lcs (>= 1.1.3)
Expand All @@ -79,16 +89,15 @@ GEM
nokogiri (~> 1.5)
rails (>= 3, < 5)
database_cleaner (1.4.1)
devise (3.5.2)
devise (4.5.0)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5)
railties (>= 4.1.0, < 6.0)
responders
thread_safe (~> 0.1)
warden (~> 1.2.3)
devise-encryptable (0.2.0)
devise (>= 2.1.0)
diff-lcs (1.2.5)
diff-lcs (1.3)
docile (1.1.5)
domain_name (0.5.24)
unf (>= 0.0.5, < 1.0.0)
Expand All @@ -108,7 +117,7 @@ GEM
exception_notification (4.1.1)
actionmailer (>= 3.0.4)
activesupport (>= 3.0.4)
execjs (2.6.0)
execjs (2.7.0)
factory_girl (4.5.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.5.0)
Expand All @@ -120,6 +129,8 @@ GEM
formatador (0.2.5)
gherkin (2.12.2)
multi_json (~> 1.3)
globalid (0.4.2)
activesupport (>= 4.2.0)
guard (2.13.0)
formatador (>= 0.2.4)
listen (>= 2.7, <= 4.0)
Expand All @@ -143,7 +154,8 @@ GEM
http-cookie (1.0.2)
domain_name (~> 0.5)
http_parser.rb (0.6.0)
i18n (0.8.4)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jquery-rails (3.1.3)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
Expand All @@ -152,19 +164,23 @@ GEM
addressable (~> 2.3)
letter_opener (1.4.1)
launchy (~> 2.2)
libv8 (3.16.14.15)
libv8 (3.16.14.19)
listen (3.0.3)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
loofah (2.3.1)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
lumberjack (1.0.9)
mail (2.6.6)
mime-types (>= 1.16, < 4)
mail (2.7.1)
mini_mime (>= 0.1.1)
method_source (0.8.2)
mime-types (2.99.3)
mini_magick (4.2.10)
mini_portile (0.6.2)
minitest (5.10.2)
multi_json (1.12.1)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.13.0)
multi_json (1.14.1)
multi_test (0.1.2)
nenv (0.2.0)
net-scp (1.2.1)
Expand All @@ -175,8 +191,8 @@ GEM
net-ssh-gateway (1.2.0)
net-ssh (>= 2.6.5)
netrc (0.10.3)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
nokogiri (1.10.5)
mini_portile2 (~> 2.4.0)
notiffany (0.0.7)
nenv (~> 0.1)
shellany (~> 0.0)
Expand All @@ -192,28 +208,37 @@ GEM
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
rack (1.5.5)
rack (1.6.11)
rack-protection (1.5.3)
rack
rack-test (0.6.3)
rack (>= 1.0)
rails (4.1.16)
actionmailer (= 4.1.16)
actionpack (= 4.1.16)
actionview (= 4.1.16)
activemodel (= 4.1.16)
activerecord (= 4.1.16)
activesupport (= 4.1.16)
rails (4.2.11)
actionmailer (= 4.2.11)
actionpack (= 4.2.11)
actionview (= 4.2.11)
activejob (= 4.2.11)
activemodel (= 4.2.11)
activerecord (= 4.2.11)
activesupport (= 4.2.11)
bundler (>= 1.3.0, < 2.0)
railties (= 4.1.16)
sprockets-rails (~> 2.0)
railties (= 4.2.11)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.9)
activesupport (>= 4.2.0, < 5.0)
nokogiri (~> 1.6)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
rails-observers (0.1.2)
activemodel (~> 4.0)
rails_autolink (1.1.6)
rails (> 3.1)
railties (4.1.16)
actionpack (= 4.1.16)
activesupport (= 4.1.16)
railties (4.2.11)
actionpack (= 4.2.11)
activesupport (= 4.2.11)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (2.1.0)
Expand All @@ -227,36 +252,40 @@ GEM
redis (~> 3.0, >= 3.0.4)
ref (2.0.0)
request_store (1.2.0)
responders (1.1.2)
railties (>= 3.2, < 4.2)
responders (2.4.0)
actionpack (>= 4.2.0, < 5.3)
railties (>= 4.2.0, < 5.3)
rest-client (1.8.0)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 3.0)
netrc (~> 0.7)
rouge (3.0.0)
rspec (2.99.0)
rspec-core (~> 2.99.0)
rspec-expectations (~> 2.99.0)
rspec-mocks (~> 2.99.0)
rspec (3.1.0)
rspec-core (~> 3.1.0)
rspec-expectations (~> 3.1.0)
rspec-mocks (~> 3.1.0)
rspec-activemodel-mocks (1.0.1)
activemodel (>= 3.0)
activesupport (>= 3.0)
rspec-mocks (>= 2.99, < 4.0)
rspec-collection_matchers (1.1.2)
rspec-collection_matchers (1.2.0)
rspec-expectations (>= 2.99.0.beta1)
rspec-core (2.99.2)
rspec-expectations (2.99.2)
diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.99.4)
rspec-rails (2.99.0)
rspec-core (3.1.7)
rspec-support (~> 3.1.0)
rspec-expectations (3.1.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.1.0)
rspec-mocks (3.1.3)
rspec-support (~> 3.1.0)
rspec-rails (3.1.0)
actionpack (>= 3.0)
activemodel (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-collection_matchers
rspec-core (~> 2.99.0)
rspec-expectations (~> 2.99.0)
rspec-mocks (~> 2.99.0)
rspec-core (~> 3.1.0)
rspec-expectations (~> 3.1.0)
rspec-mocks (~> 3.1.0)
rspec-support (~> 3.1.0)
rspec-support (3.1.2)
rubocop (0.43.0)
parser (>= 2.3.1.1, < 3.0)
powerpack (~> 0.1)
Expand Down Expand Up @@ -301,7 +330,7 @@ GEM
spork-rails (4.0.0)
rails (>= 3.0.0, < 5)
spork (>= 1.0rc0)
sprockets (2.12.4)
sprockets (2.12.5)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
Expand All @@ -315,16 +344,16 @@ GEM
tins (~> 1.0)
test-unit (3.1.3)
power_assert
therubyracer (0.12.2)
libv8 (~> 3.16.14.0)
therubyracer (0.12.3)
libv8 (~> 3.16.14.15)
ref
thor (0.19.4)
thread_safe (0.3.6)
tilt (1.4.1)
timecop (0.8.0)
timers (1.1.0)
tins (1.6.0)
tzinfo (1.2.3)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (2.7.2)
execjs (>= 0.3.0)
Expand All @@ -334,7 +363,7 @@ GEM
unf_ext
unf_ext (0.0.7.1)
unicode-display_width (1.1.1)
warden (1.2.3)
warden (1.2.7)
rack (>= 1.0)
webrat (0.7.3)
nokogiri (>= 1.2.0)
Expand Down Expand Up @@ -375,16 +404,16 @@ DEPENDENCIES
pg
protected_attributes (~> 1.0.0)
pry
rails (~> 4.1.0)
rails (= 4.2.11)
rails-observers
rails_autolink (>= 1.1.5)
rake (< 11.0)
rdiscount
rouge
rspec
rspec (= 3.1)
rspec-activemodel-mocks
rspec-collection_matchers
rspec-rails (~> 2.14)
rspec-rails (~> 3.1.0)
rubocop
sanitize (~> 2.0)
sass (~> 3.2.0)
Expand All @@ -405,4 +434,4 @@ DEPENDENCIES
will_paginate

BUNDLED WITH
1.16.0
1.17.2

0 comments on commit 8028f5f

Please sign in to comment.