From a343b970d9f16a8e900011da671e1d41cb2e7468 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Wed, 3 Feb 2016 17:44:13 -0500 Subject: [PATCH] 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