From c8e9ab32216c114da24364d47ff2a90b4b522233 Mon Sep 17 00:00:00 2001 From: domaindrivendev Date: Mon, 23 Apr 2018 16:24:43 -0700 Subject: [PATCH] Add puma to Gemfile to fix integration tests --- Gemfile | 1 + test-app/db/schema.rb | 17 +++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Gemfile b/Gemfile index 82f014e..c690f16 100644 --- a/Gemfile +++ b/Gemfile @@ -28,6 +28,7 @@ group :test do gem 'generator_spec' gem 'capybara' gem 'capybara-webkit' + gem 'puma' end group :assets do diff --git a/test-app/db/schema.rb b/test-app/db/schema.rb index 8accba1..d7ecc76 100644 --- a/test-app/db/schema.rb +++ b/test-app/db/schema.rb @@ -1,3 +1,4 @@ +# encoding: UTF-8 # This file is auto-generated from the current state of the database. Instead # of editing this file, please use the migrations feature of Active Record to # incrementally modify your database, and then regenerate this schema definition. @@ -8,16 +9,16 @@ # 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 that you check this file into your version control system. +# It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(version: 20160218212104) do +ActiveRecord::Schema.define(:version => 20160218212104) do - create_table "blogs", force: :cascade do |t| - t.string "title" - t.text "content" - t.string "thumbnail" - t.datetime "created_at" - t.datetime "updated_at" + create_table "blogs", :force => true do |t| + t.string "title" + t.text "content" + t.string "thumbnail" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false end end