From 202ce116f80a22a6b79a44b1183b147dfd2a940a Mon Sep 17 00:00:00 2001 From: Al Snow Date: Sun, 17 Jan 2016 20:41:41 -0500 Subject: [PATCH 1/6] Upgrade capybara and test-unit gems --- Gemfile.lock | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 770e8bc..d6082de 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -65,7 +65,8 @@ GEM bundler-audit (0.4.0) bundler (~> 1.2) thor (~> 0.18) - capybara (2.5.0) + capybara (2.6.0) + addressable mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) @@ -299,7 +300,7 @@ GEM 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) From 578b115a83d9a674793453b0d5db003ec7e95827 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Thu, 21 Jan 2016 09:18:59 -0500 Subject: [PATCH 2/6] Upgraded 7 gems --- Gemfile.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index d6082de..80fa264 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -85,7 +85,7 @@ GEM coffee-script-source (1.10.0) concurrent-ruby (1.0.0) crack (0.3.1) - cucumber (2.3.0) + cucumber (2.3.1) builder (>= 2.1.2) cucumber-core (~> 1.4.0) cucumber-wire (~> 0.0.1) @@ -107,7 +107,7 @@ GEM http_parser.rb (~> 0.6.0) erubis (2.7.0) event-bus (0.1.0) - eventmachine (1.0.8) + eventmachine (1.0.9.1) execjs (2.6.0) fastercsv (1.5.5) ffi (1.9.10) @@ -171,9 +171,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) @@ -187,7 +187,7 @@ GEM 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) @@ -283,9 +283,9 @@ GEM rack (~> 1.4) 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) From 1f3c2821dcd4179673d87b966f9b90e82bbde3d5 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Thu, 21 Jan 2016 20:46:04 -0500 Subject: [PATCH 3/6] Upgraded 4 gems --- Gemfile.lock | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 80fa264..156d5a4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -85,12 +85,11 @@ GEM coffee-script-source (1.10.0) concurrent-ruby (1.0.0) crack (0.3.1) - cucumber (2.3.1) + 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) @@ -106,7 +105,6 @@ 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) execjs (2.6.0) fastercsv (1.5.5) @@ -182,7 +180,7 @@ 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) @@ -262,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) @@ -272,7 +270,7 @@ 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) docile (~> 1.1.0) From 19668c0f4370c6ff22b8294104d0bcd80a5a1260 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Mon, 25 Jan 2016 18:12:06 -0500 Subject: [PATCH 4/6] Upgraded to Rails 4.2.5.1 --- Gemfile | 2 +- Gemfile.lock | 67 ++++++++++++++++++++++++++-------------------------- 2 files changed, 35 insertions(+), 34 deletions(-) diff --git a/Gemfile b/Gemfile index ba7f519..d3599a7 100755 --- a/Gemfile +++ b/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' diff --git a/Gemfile.lock b/Gemfile.lock index 156d5a4..e3543a8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,36 +1,36 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.5) - actionpack (= 4.2.5) - actionview (= 4.2.5) - activejob (= 4.2.5) + actionmailer (4.2.5.1) + actionpack (= 4.2.5.1) + actionview (= 4.2.5.1) + activejob (= 4.2.5.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.5) - actionview (= 4.2.5) - activesupport (= 4.2.5) + actionpack (4.2.5.1) + actionview (= 4.2.5.1) + 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) - activesupport (= 4.2.5) + actionview (4.2.5.1) + 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) - activesupport (= 4.2.5) + activejob (4.2.5.1) + activesupport (= 4.2.5.1) globalid (>= 0.3.0) - activemodel (4.2.5) - activesupport (= 4.2.5) + activemodel (4.2.5.1) + activesupport (= 4.2.5.1) builder (~> 3.1) - activerecord (4.2.5) - activemodel (= 4.2.5) - activesupport (= 4.2.5) + activerecord (4.2.5.1) + activemodel (= 4.2.5.1) + 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) @@ -113,6 +113,7 @@ GEM thor (~> 0.19.1) formatador (0.2.5) gauntlt (0.1.4) + aruba cucumber nokogiri trollop @@ -211,16 +212,16 @@ GEM rack rack-test (0.6.3) rack (>= 1.0) - rails (4.2.5) - actionmailer (= 4.2.5) - actionpack (= 4.2.5) - actionview (= 4.2.5) - activejob (= 4.2.5) - activemodel (= 4.2.5) - activerecord (= 4.2.5) - activesupport (= 4.2.5) + rails (4.2.5.1) + actionmailer (= 4.2.5.1) + actionpack (= 4.2.5.1) + actionview (= 4.2.5.1) + activejob (= 4.2.5.1) + activemodel (= 4.2.5.1) + activerecord (= 4.2.5.1) + 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) @@ -228,11 +229,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) - actionpack (= 4.2.5) - activesupport (= 4.2.5) + railties (4.2.5.1) + actionpack (= 4.2.5.1) + activesupport (= 4.2.5.1) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) raindrops (0.15.0) @@ -277,8 +278,8 @@ GEM json (~> 1.8) simplecov-html (~> 0.10.0) simplecov-html (0.10.0) - sinatra (1.4.6) - rack (~> 1.4) + sinatra (1.4.7) + rack (~> 1.5) rack-protection (~> 1.4) tilt (>= 1.3, < 3) skinny (0.2.4) @@ -361,7 +362,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 From f6fc46c825113a6f06ff091e2af09a0735c72eb6 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Fri, 29 Jan 2016 09:50:13 -0500 Subject: [PATCH 5/6] Upgraded 3 gems --- Gemfile.lock | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index e3543a8..31c23fb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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,7 @@ GEM bundler-audit (0.4.0) bundler (~> 1.2) thor (~> 0.18) - capybara (2.6.0) + capybara (2.6.2) addressable mime-types (>= 1.16) nokogiri (>= 1.3.3) @@ -113,7 +113,6 @@ GEM thor (~> 0.19.1) formatador (0.2.5) gauntlt (0.1.4) - aruba cucumber nokogiri trollop @@ -292,7 +291,7 @@ 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) From a343b970d9f16a8e900011da671e1d41cb2e7468 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Wed, 3 Feb 2016 17:44:13 -0500 Subject: [PATCH 6/6] Upgraded simplecov and poltergeist gems --- Gemfile.lock | 4 +-- db/schema.rb | 70 ++++++++++++++++++++++++++-------------------------- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 31c23fb..b2aeb60 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -190,7 +190,7 @@ GEM 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) @@ -272,7 +272,7 @@ GEM tilt (>= 1.1, < 3) 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) diff --git a/db/schema.rb b/db/schema.rb index a51d0db..d7745b9 100755 --- a/db/schema.rb +++ b/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 "updated_at", :null => false + t.datetime "created_at" + t.datetime "updated_at" end - create_table "benefits", :force => true do |t| - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + create_table "benefits", force: :cascade do |t| + t.datetime "created_at" + 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 "updated_at", :null => false + t.datetime "created_at" + 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 "updated_at", :null => false + t.datetime "created_at" + 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 "updated_at", :null => false + t.datetime "created_at" + 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 "updated_at", :null => false + t.datetime "created_at" + 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 "updated_at", :null => false + t.datetime "created_at" + 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 "updated_at", :null => false + t.datetime "created_at" + 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 "updated_at", :null => false + t.datetime "created_at" + 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 "updated_at", :null => false + t.datetime "created_at" + 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 "updated_at", :null => false + t.datetime "created_at" + t.datetime "updated_at" t.binary "encrypted_ssn" end