Merge pull request #219 from jasnow/master

Upgrade rails (4.2.5.1), capybara, test-unit plus more gems

Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 #don't upgrade
-gem 'rails', '4.2.5'
+gem 'rails', '4.2.5.1'
 
 ruby '2.3.0'
 

Gemfile.lock

@@ -1,36 +1,36 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.5)
+    actionmailer (4.2.5.1)
-      actionpack (= 4.2.5)
+      actionpack (= 4.2.5.1)
-      actionview (= 4.2.5)
+      actionview (= 4.2.5.1)
-      activejob (= 4.2.5)
+      activejob (= 4.2.5.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.5)
+    actionpack (4.2.5.1)
-      actionview (= 4.2.5)
+      actionview (= 4.2.5.1)
-      activesupport (= 4.2.5)
+      activesupport (= 4.2.5.1)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.5)
+    actionview (4.2.5.1)
-      activesupport (= 4.2.5)
+      activesupport (= 4.2.5.1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.5)
+    activejob (4.2.5.1)
-      activesupport (= 4.2.5)
+      activesupport (= 4.2.5.1)
       globalid (>= 0.3.0)
-    activemodel (4.2.5)
+    activemodel (4.2.5.1)
-      activesupport (= 4.2.5)
+      activesupport (= 4.2.5.1)
       builder (~> 3.1)
-    activerecord (4.2.5)
+    activerecord (4.2.5.1)
-      activemodel (= 4.2.5)
+      activemodel (= 4.2.5.1)
-      activesupport (= 4.2.5)
+      activesupport (= 4.2.5.1)
       arel (~> 6.0)
-    activesupport (4.2.5)
+    activesupport (4.2.5.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -49,7 +49,7 @@ GEM
       rack (>= 0.9.0)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    brakeman (3.1.4)
+    brakeman (3.1.5)
       erubis (~> 2.6)
       fastercsv (~> 1.5)
       haml (>= 3.0, < 5.0)
@@ -65,7 +65,8 @@ GEM
     bundler-audit (0.4.0)
       bundler (~> 1.2)
       thor (~> 0.18)
-    capybara (2.5.0)
+    capybara (2.6.2)
+      addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
@@ -84,12 +85,11 @@ GEM
     coffee-script-source (1.10.0)
     concurrent-ruby (1.0.0)
     crack (0.3.1)
-    cucumber (2.3.0)
+    cucumber (2.3.2)
       builder (>= 2.1.2)
       cucumber-core (~> 1.4.0)
       cucumber-wire (~> 0.0.1)
       diff-lcs (>= 1.1.3)
-      event-bus (~> 0.1.0)
       gherkin (~> 3.2.0)
       multi_json (>= 1.7.5, < 2.0)
       multi_test (>= 0.1.2)
@@ -105,8 +105,7 @@ GEM
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     erubis (2.7.0)
-    event-bus (0.1.0)
+    eventmachine (1.0.9.1)
-    eventmachine (1.0.8)
     execjs (2.6.0)
     fastercsv (1.5.5)
     ffi (1.9.10)
@@ -170,9 +169,9 @@ GEM
     lumberjack (1.0.10)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
-    mailcatcher (0.6.2)
+    mailcatcher (0.6.3)
       activesupport (>= 4.0.0, < 5)
-      eventmachine (= 1.0.8)
+      eventmachine (= 1.0.9.1)
       mail (~> 2.3)
       sinatra (~> 1.2)
       skinny (~> 0.2.3)
@@ -181,17 +180,17 @@ GEM
     method_source (0.8.2)
     mime-types (2.99)
     mini_portile2 (2.0.0)
-    minitest (5.8.3)
+    minitest (5.8.4)
     multi_json (1.11.2)
     multi_test (0.1.2)
     mysql2 (0.4.2)
     nenv (0.2.0)
-    nokogiri (1.6.7.1)
+    nokogiri (1.6.7.2)
       mini_portile2 (~> 2.0.0.rc2)
     notiffany (0.0.8)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    poltergeist (1.8.1)
+    poltergeist (1.9.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       multi_json (~> 1.0)
@@ -212,16 +211,16 @@ GEM
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.5)
+    rails (4.2.5.1)
-      actionmailer (= 4.2.5)
+      actionmailer (= 4.2.5.1)
-      actionpack (= 4.2.5)
+      actionpack (= 4.2.5.1)
-      actionview (= 4.2.5)
+      actionview (= 4.2.5.1)
-      activejob (= 4.2.5)
+      activejob (= 4.2.5.1)
-      activemodel (= 4.2.5)
+      activemodel (= 4.2.5.1)
-      activerecord (= 4.2.5)
+      activerecord (= 4.2.5.1)
-      activesupport (= 4.2.5)
+      activesupport (= 4.2.5.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.5)
+      railties (= 4.2.5.1)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
@@ -229,11 +228,11 @@ GEM
       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.2)
+    rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (4.2.5)
+    railties (4.2.5.1)
-      actionpack (= 4.2.5)
+      actionpack (= 4.2.5.1)
-      activesupport (= 4.2.5)
+      activesupport (= 4.2.5.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     raindrops (0.15.0)
@@ -261,7 +260,7 @@ GEM
     ruby2ruby (2.2.0)
       ruby_parser (~> 3.1)
       sexp_processor (~> 4.0)
-    ruby_parser (3.7.2)
+    ruby_parser (3.7.3)
       sexp_processor (~> 4.1)
     safe_yaml (1.0.4)
     sass (3.4.21)
@@ -271,20 +270,20 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    sexp_processor (4.6.0)
+    sexp_processor (4.6.1)
     shellany (0.0.1)
-    simplecov (0.11.1)
+    simplecov (0.11.2)
       docile (~> 1.1.0)
       json (~> 1.8)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    sinatra (1.4.6)
+    sinatra (1.4.7)
-      rack (~> 1.4)
+      rack (~> 1.5)
       rack-protection (~> 1.4)
       tilt (>= 1.3, < 3)
-    skinny (0.2.3)
+    skinny (0.2.4)
       eventmachine (~> 1.0.0)
-      thin (~> 1.5.0)
+      thin (>= 1.5, < 1.7)
     slim (3.0.6)
       temple (~> 0.7.3)
       tilt (>= 1.3.3, < 2.1)
@@ -292,14 +291,14 @@ GEM
     sprockets (3.5.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.0.0)
+    sprockets-rails (3.0.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sqlite3 (1.3.11)
     temple (0.7.6)
     terminal-table (1.5.2)
-    test-unit (3.1.5)
+    test-unit (3.1.7)
       power_assert
     therubyracer (0.12.2)
       libv8 (~> 3.16.14.0)
@@ -362,7 +361,7 @@ DEPENDENCIES
   pry
   pry-rails
   rack-livereload
-  rails (= 4.2.5)
+  rails (= 4.2.5.1)
   rb-fsevent
   rspec-rails (= 2.14.2)
   sass-rails

db/schema.rb

@@ -9,109 +9,109 @@
 # from scratch. The latter is a flawed and unsustainable approach (the more migrations
 # you'll amass, the slower it'll run and the greater likelihood for issues).
 #
-# It's strongly recommended to check this file into your version control system.
+# It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20140408185601) do
+ActiveRecord::Schema.define(version: 20140408185601) do
 
-  create_table "analytics", :force => true do |t|
+  create_table "analytics", force: :cascade do |t|
     t.string   "ip_address"
     t.string   "referrer"
     t.string   "user_agent"
-    t.datetime "created_at", :null => false
+    t.datetime "created_at"
-    t.datetime "updated_at", :null => false
+    t.datetime "updated_at"
   end
 
-  create_table "benefits", :force => true do |t|
+  create_table "benefits", force: :cascade do |t|
-    t.datetime "created_at", :null => false
+    t.datetime "created_at"
-    t.datetime "updated_at", :null => false
+    t.datetime "updated_at"
   end
 
-  create_table "key_managements", :force => true do |t|
+  create_table "key_managements", force: :cascade do |t|
     t.string   "iv"
     t.integer  "user_id"
-    t.datetime "created_at", :null => false
+    t.datetime "created_at"
-    t.datetime "updated_at", :null => false
+    t.datetime "updated_at"
   end
 
-  create_table "messages", :force => true do |t|
+  create_table "messages", force: :cascade do |t|
     t.integer  "creator_id"
     t.integer  "receiver_id"
     t.text     "message"
     t.boolean  "read"
-    t.datetime "created_at",  :null => false
+    t.datetime "created_at"
-    t.datetime "updated_at",  :null => false
+    t.datetime "updated_at"
   end
 
-  create_table "paid_time_offs", :force => true do |t|
+  create_table "paid_time_offs", force: :cascade do |t|
     t.integer  "user_id"
     t.integer  "sick_days_taken"
     t.integer  "sick_days_earned"
     t.integer  "pto_taken"
     t.integer  "pto_earned"
-    t.datetime "created_at",       :null => false
+    t.datetime "created_at"
-    t.datetime "updated_at",       :null => false
+    t.datetime "updated_at"
   end
 
-  create_table "pays", :force => true do |t|
+  create_table "pays", force: :cascade do |t|
     t.integer  "user_id"
     t.string   "bank_account_num"
     t.string   "bank_routing_num"
     t.integer  "percent_of_deposit"
-    t.datetime "created_at",         :null => false
+    t.datetime "created_at"
-    t.datetime "updated_at",         :null => false
+    t.datetime "updated_at"
   end
 
-  create_table "performances", :force => true do |t|
+  create_table "performances", force: :cascade do |t|
     t.integer  "user_id"
     t.date     "date_submitted"
     t.integer  "score"
     t.string   "comments"
     t.integer  "reviewer"
-    t.datetime "created_at",     :null => false
+    t.datetime "created_at"
-    t.datetime "updated_at",     :null => false
+    t.datetime "updated_at"
   end
 
-  create_table "retirements", :force => true do |t|
+  create_table "retirements", force: :cascade do |t|
     t.string   "total"
     t.string   "employee_contrib"
     t.string   "employer_contrib"
     t.integer  "user_id"
-    t.datetime "created_at",       :null => false
+    t.datetime "created_at"
-    t.datetime "updated_at",       :null => false
+    t.datetime "updated_at"
   end
 
-  create_table "schedules", :force => true do |t|
+  create_table "schedules", force: :cascade do |t|
     t.string   "event_type"
     t.date     "date_begin"
     t.date     "date_end"
     t.string   "event_name"
     t.string   "event_desc"
     t.integer  "user_id"
-    t.datetime "created_at", :null => false
+    t.datetime "created_at"
-    t.datetime "updated_at", :null => false
+    t.datetime "updated_at"
   end
 
-  create_table "users", :force => true do |t|
+  create_table "users", force: :cascade do |t|
     t.string   "email"
     t.string   "password"
     t.boolean  "admin"
     t.string   "first_name"
     t.string   "last_name"
     t.integer  "user_id"
-    t.datetime "created_at", :null => false
+    t.datetime "created_at"
-    t.datetime "updated_at", :null => false
+    t.datetime "updated_at"
     t.string   "auth_token"
   end
 
-  create_table "work_infos", :force => true do |t|
+  create_table "work_infos", force: :cascade do |t|
     t.integer  "user_id"
     t.string   "income"
     t.string   "bonuses"
     t.integer  "years_worked"
     t.string   "SSN"
     t.date     "DoB"
-    t.datetime "created_at",    :null => false
+    t.datetime "created_at"
-    t.datetime "updated_at",    :null => false
+    t.datetime "updated_at"
     t.binary   "encrypted_ssn"
   end