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

Bump to rails version 4.2.8 #211

Merged
merged 1 commit into from Jun 1, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion Gemfile
@@ -1,7 +1,7 @@
source 'https://rubygems.org'
ruby '2.1.5'

gem 'rails', '4.1.16'
gem 'rails', '4.2.8'

gem 'mongo', '2.1.2'
gem 'bson', '3.1.1'
Expand Down Expand Up @@ -40,6 +40,7 @@ group :test, :development do
gem 'simplecov', :require => false
gem "codeclimate-test-reporter", "~> 1.0.0"
gem "capybara"
gem "launchy"
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is new requirement for 4.2.8?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i added that so we could use save_and_open_page from capybara for debugging. it's not mission critical so I can remove that if you want :)

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gotcha, ok. Nah, that's fine.

gem "pry-byebug"
gem "pry-stack_explorer"
gem 'poltergeist'
Expand Down
100 changes: 62 additions & 38 deletions Gemfile.lock
Expand Up @@ -15,35 +15,43 @@ PATH
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.1.16)
actionpack (= 4.1.16)
actionview (= 4.1.16)
actionmailer (4.2.8)
actionpack (= 4.2.8)
actionview (= 4.2.8)
activejob (= 4.2.8)
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.8)
actionview (= 4.2.8)
activesupport (= 4.2.8)
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.8)
activesupport (= 4.2.8)
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.8)
activesupport (= 4.2.8)
globalid (>= 0.3.0)
activemodel (4.2.8)
activesupport (= 4.2.8)
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.8)
activemodel (= 4.2.8)
activesupport (= 4.2.8)
arel (~> 6.0)
activesupport (4.2.8)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.5.0)
public_suffix (~> 2.0, >= 2.0.2)
arel (5.0.1.20140414130214)
arel (6.0.4)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
bson (3.1.1)
Expand Down Expand Up @@ -71,12 +79,18 @@ GEM
activesupport (>= 3.0.0)
faker (1.7.2)
i18n (~> 0.5)
globalid (0.4.0)
activesupport (>= 4.2.0)
hashie (3.4.6)
highline (1.7.8)
i18n (0.8.1)
json (1.8.2)
json_pure (2.0.2)
kgio (2.11.0)
launchy (2.4.3)
addressable (~> 2.3)
loofah (2.0.3)
nokogiri (>= 1.5.9)
mail (2.6.5)
mime-types (>= 1.16, < 4)
memcachier (0.0.2)
Expand Down Expand Up @@ -123,23 +137,32 @@ GEM
binding_of_caller (>= 0.7)
pry (>= 0.9.11)
public_suffix (2.0.5)
rack (1.5.5)
rack (1.6.8)
rack-test (0.6.3)
rack (>= 1.0)
rack-timeout (0.4.2)
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.8)
actionmailer (= 4.2.8)
actionpack (= 4.2.8)
actionview (= 4.2.8)
activejob (= 4.2.8)
activemodel (= 4.2.8)
activerecord (= 4.2.8)
activesupport (= 4.2.8)
bundler (>= 1.3.0, < 2.0)
railties (= 4.1.16)
sprockets-rails (~> 2.0)
railties (4.1.16)
actionpack (= 4.1.16)
activesupport (= 4.1.16)
railties (= 4.2.8)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.8)
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
railties (4.2.8)
actionpack (= 4.2.8)
activesupport (= 4.2.8)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
raindrops (0.17.0)
Expand Down Expand Up @@ -172,10 +195,10 @@ GEM
sprockets (3.7.1)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (2.3.3)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
sprockets-rails (3.2.0)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
thor (0.19.4)
thread_safe (0.3.6)
tweet-button (0.1.0)
Expand All @@ -202,6 +225,7 @@ DEPENDENCIES
factory_girl (~> 4.0)
faker
json (= 1.8.2)
launchy
memcachier
mongo (= 2.1.2)
mongoid (= 5.0.0)
Expand All @@ -213,7 +237,7 @@ DEPENDENCIES
pry-byebug
pry-stack_explorer
rack-timeout
rails (= 4.1.16)
rails (= 4.2.8)
rails3_serve_static_assets!
rspec-rails (= 3.6.0)
shoulda-matchers
Expand Down
6 changes: 3 additions & 3 deletions spec/features/submitting_a_challenge_spec.rb
Expand Up @@ -18,9 +18,9 @@

expect(page).to have_text "Title can't be blank"
expect(page).to have_text "Description can't be blank"
expect(page).to have_text "Input is too short (minimum is 1 characters)"
expect(page).to have_text "Output is too short (minimum is 1 characters)"
expect(page).to have_text "Diff is too short (minimum is 1 characters)"
expect(page).to have_text "Input is too short (minimum is 1 character)"
expect(page).to have_text "Output is too short (minimum is 1 character)"
expect(page).to have_text "Diff is too short (minimum is 1 character)"
end

scenario "with properly filled out fields" do
Expand Down