Upgrade to Rails 4.2

Gemfile

@@ -1,8 +1,8 @@
 source 'https://rubygems.org'
 
-gem 'rails', '~>4.1.11'
-gem 'sass-rails', '~>4.0'
-gem 'coffee-rails', '~>4.0'
+gem 'rails', '~> 4.2.6'
+gem 'sass-rails', '~> 5.0'
+gem 'coffee-rails', '~> 4.1.0'
 
 #gem 'json'
 
@@ -52,7 +52,7 @@ group :development do
   gem "spring-commands-cucumber"
   gem "yard"
 
-  gem 'tolk', '~> 1.6.0'
+  gem 'tolk', '~> 1.9.3'
 
   gem "bullet"
   gem "rack-mini-profiler"
@@ -65,12 +65,17 @@ group :development, :test do
 end
 
 group :test do
+  # Pull in the fix for rails-dom-testing issue #42
+  # TODO: Remove with Rails 5 and rails-dom-testing 2.x
+  gem 'rails-dom-testing', github: 'rails/rails-dom-testing', ref: 'a64f30514ee65f172c43f42cfd4500b5e11a561a'
+
   gem "factory_girl_rails"
   gem "capybara"
   gem "cucumber-rails", :require => false
   gem "rspec-expectations"
   gem "database_cleaner"
   gem "mocha", :require => false
+  gem "minitest-stub-const"
 
   gem "aruba", ">=0.5.4", :require => false
 

Gemfile.lock

@@ -1,40 +1,59 @@
+GIT
+  remote: git://github.com/rails/rails-dom-testing.git
+  revision: a64f30514ee65f172c43f42cfd4500b5e11a561a
+  ref: a64f30514ee65f172c43f42cfd4500b5e11a561a
+  specs:
+    rails-dom-testing (1.0.7)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+
 GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.2.9)
     aasm (3.4.0)
-    actionmailer (4.1.14.1)
-      actionpack (= 4.1.14.1)
-      actionview (= 4.1.14.1)
+    actionmailer (4.2.6)
+      actionpack (= 4.2.6)
+      actionview (= 4.2.6)
+      activejob (= 4.2.6)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.14.1)
-      actionview (= 4.1.14.1)
-      activesupport (= 4.1.14.1)
-      rack (~> 1.5.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.6)
+      actionview (= 4.2.6)
+      activesupport (= 4.2.6)
+      rack (~> 1.6)
       rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
     actionpack-xml_parser (1.0.1)
       actionpack (>= 4.0.0.rc1)
-    actionview (4.1.14.1)
-      activesupport (= 4.1.14.1)
+    actionview (4.2.6)
+      activesupport (= 4.2.6)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.14.1)
-      activesupport (= 4.1.14.1)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (4.2.6)
+      activesupport (= 4.2.6)
+      globalid (>= 0.3.0)
+    activemodel (4.2.6)
+      activesupport (= 4.2.6)
       builder (~> 3.1)
-    activerecord (4.1.14.1)
-      activemodel (= 4.1.14.1)
-      activesupport (= 4.1.14.1)
-      arel (~> 5.0.0)
+    activerecord (4.2.6)
+      activemodel (= 4.2.6)
+      activesupport (= 4.2.6)
+      arel (~> 6.0)
     activerecord-deprecated_finders (1.0.3)
-    activesupport (4.1.14.1)
-      i18n (~> 0.6, >= 0.6.9)
+    activesupport (4.2.6)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    acts_as_list (0.5.0)
+    acts_as_list (0.7.2)
       activerecord (>= 3.0)
-    arel (5.0.1.20140414130214)
+    arel (6.0.3)
     aruba (0.6.1)
       childprocess (>= 0.3.6)
       cucumber (>= 1.1.1)
@@ -68,10 +87,11 @@ GEM
     coffee-rails (4.1.0)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)
-    coffee-script (2.3.0)
+    coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.8.0)
+    coffee-script-source (1.9.1.1)
+    concurrent-ruby (1.0.2)
     crass (0.2.1)
     cucumber (1.3.18)
       builder (>= 2.1.2)
@@ -102,7 +122,8 @@ GEM
       sass (>= 3.2)
     gherkin (2.12.2)
       multi_json (~> 1.3)
-    hike (1.2.3)
+    globalid (0.3.6)
+      activesupport (>= 4.1.0)
     htmlentities (4.3.3)
     i18n (0.7.0)
     jquery-rails (3.1.3)
@@ -112,20 +133,23 @@ GEM
       railties (>= 3.2.16)
     json (1.8.3)
     libv8 (3.16.14.7)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
     metaclass (0.0.4)
     method_source (0.8.2)
-    mime-types (2.99)
+    mime-types (2.99.2)
     mimemagic (0.3.0)
     mini_portile2 (2.0.0)
-    minitest (5.8.4)
+    minitest (5.9.0)
+    minitest-stub-const (0.5)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     multi_json (1.11.2)
     multi_test (0.1.1)
     mysql2 (0.3.20)
-    nokogiri (1.6.7)
+    nokogiri (1.6.7.2)
       mini_portile2 (~> 2.0.0.rc2)
     nokogumbo (1.1.12)
       nokogiri
@@ -139,31 +163,36 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (1.5.5)
+    rack (1.6.4)
     rack-dev-mark (0.7.3)
       rack (>= 1.1)
     rack-mini-profiler (0.9.2)
       rack (>= 1.1.3)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.1.14.1)
-      actionmailer (= 4.1.14.1)
-      actionpack (= 4.1.14.1)
-      actionview (= 4.1.14.1)
-      activemodel (= 4.1.14.1)
-      activerecord (= 4.1.14.1)
-      activesupport (= 4.1.14.1)
+    rails (4.2.6)
+      actionmailer (= 4.2.6)
+      actionpack (= 4.2.6)
+      actionview (= 4.2.6)
+      activejob (= 4.2.6)
+      activemodel (= 4.2.6)
+      activerecord (= 4.2.6)
+      activesupport (= 4.2.6)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.14.1)
-      sprockets-rails (~> 2.0)
+      railties (= 4.2.6)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
     rails_autolink (1.1.6)
       rails (> 3.1)
-    railties (4.1.14.1)
-      actionpack (= 4.1.14.1)
-      activesupport (= 4.1.14.1)
+    railties (4.2.6)
+      actionpack (= 4.2.6)
+      activesupport (= 4.2.6)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.5.0)
+    rake (11.1.2)
     ref (1.0.5)
     rspec-expectations (3.1.2)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -175,12 +204,13 @@ GEM
       crass (~> 0.2.0)
       nokogiri (>= 1.4.4)
       nokogumbo (= 1.1.12)
-    sass (3.2.19)
-    sass-rails (4.0.4)
+    sass (3.4.22)
+    sass-rails (5.0.4)
       railties (>= 4.0.0, < 5.0)
-      sass (~> 3.2.2)
-      sprockets (~> 2.8, < 2.12)
-      sprockets-rails (~> 2.0)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
+      tilt (>= 1.1, < 3)
     selenium-webdriver (2.50.0)
       childprocess (~> 0.5)
       multi_json (~> 1.0)
@@ -195,15 +225,13 @@ GEM
     spring (1.1.3)
     spring-commands-cucumber (1.0.1)
       spring (>= 0.9.1)
-    sprockets (2.11.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.3.3)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
+    sprockets (3.6.0)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.0.4)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
     sqlite3 (1.3.10)
     swf_fu (2.0.4)
       coffee-script
@@ -217,11 +245,10 @@ GEM
       rack (~> 1.0)
     thor (0.19.1)
     thread_safe (0.3.5)
-    tilt (1.4.1)
-    tolk (1.6.0)
-      rails (>= 4.0, < 4.2)
+    tilt (2.0.4)
+    tolk (1.9.3)
+      rails (>= 4.0, < 4.3)
       safe_yaml (>= 0.8.6)
-      will_paginate
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     uglifier (2.7.2)
@@ -249,25 +276,27 @@ DEPENDENCIES
   bullet
   capybara
   codeclimate-test-reporter
-  coffee-rails (~> 4.0)
+  coffee-rails (~> 4.1.0)
   cucumber-rails
   database_cleaner
   factory_girl_rails
   font-awesome-sass (~> 4.5.0)
   htmlentities
   jquery-rails
   jquery-ui-rails
+  minitest-stub-const
   mocha
   mysql2 (~> 0.3.17)
   paperclip
   pry
   rack-dev-mark
   rack-mini-profiler
-  rails (~> 4.1.11)
+  rails (~> 4.2.6)
+  rails-dom-testing!
   rails_autolink
   rspec-expectations
   sanitize (>= 3.0.0)
-  sass-rails (~> 4.0)
+  sass-rails (~> 5.0)
   selenium-webdriver (>= 2.50)
   simplecov
   spring
@@ -276,10 +305,10 @@ DEPENDENCIES
   swf_fu
   therubyracer
   thin
-  tolk (~> 1.6.0)
+  tolk (~> 1.9.3)
   uglifier (>= 1.3.0)
   will_paginate
   yard
 
 BUNDLED WITH
-   1.10.6
+   1.11.2

app/assets/javascripts/application.js

@@ -2,7 +2,7 @@
 // listed below.
 //
 // Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
+// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path.
 //
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
 // compiled file.

app/assets/stylesheets/application.css.scss → app/assets/stylesheets/application.scss

@@ -3,7 +3,7 @@
  * listed below.
  *
  * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
+ * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
  *
  * You're free to add application-wide styles to this file and they'll appear at the bottom of the
  * compiled file so the styles you add here take precedence over styles defined in any styles

bin/bundle

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+load Gem.bin_path('bundler', 'bundle')

bin/rails

@@ -1,10 +1,4 @@
 #!/usr/bin/env ruby
-begin
-  load File.expand_path("../spring", __FILE__)
-rescue LoadError
-end
-# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
-
-APP_PATH = File.expand_path('../../config/application',  __FILE__)
-require File.expand_path('../../config/boot',  __FILE__)
+APP_PATH = File.expand_path('../../config/application', __FILE__)
+require_relative '../config/boot'
 require 'rails/commands'

bin/rake

@@ -1,7 +1,4 @@
 #!/usr/bin/env ruby
-begin
-  load File.expand_path("../spring", __FILE__)
-rescue LoadError
-end
-require 'bundler/setup'
-load Gem.bin_path('rake', 'rake')
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run

bin/setup

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+require 'pathname'
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
+
+Dir.chdir APP_ROOT do
+  # This script is a starting point to setup your application.
+  # Add necessary setup steps to this file:
+
+  puts "== Installing dependencies =="
+  system "gem install bundler --conservative"
+  system "bundle check || bundle install"
+
+  # puts "\n== Copying sample files =="
+  # unless File.exist?("config/database.yml")
+  #   system "cp config/database.yml.sample config/database.yml"
+  # end
+
+  puts "\n== Preparing database =="
+  system "bin/rake db:setup"
+
+  puts "\n== Removing old logs and tempfiles =="
+  system "rm -f log/*"
+  system "rm -rf tmp/cache"
+
+  puts "\n== Restarting application server =="
+  system "touch tmp/restart.txt"
+end