From c64c79f5e36699fad2b84a67571bb7af0e03a696 Mon Sep 17 00:00:00 2001 From: Nicolas Brousse Date: Sat, 11 Sep 2021 18:20:48 +0200 Subject: [PATCH] wip --- .gitignore | 1 + Gemfile | 4 +++- Gemfile.lock | 1 + config.ru | 7 +++---- spec/internal/config/database.yml | 4 ++++ 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index c0330410..51f64756 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ # combustion spec/internal/db/*.sqlite spec/internal/log +spec/internal/tmp diff --git a/Gemfile b/Gemfile index d22f8fc9..5c2d9c4d 100644 --- a/Gemfile +++ b/Gemfile @@ -21,6 +21,8 @@ gem "simplecov", require: false, group: :test gem "sqlite3" group :development do - gem "lookbook", require: false + gem "view_component", require: "view_component/engine" + + gem "lookbook" gem "puma" end diff --git a/Gemfile.lock b/Gemfile.lock index 059ade26..dca76d5a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -303,6 +303,7 @@ DEPENDENCIES rubocop-rspec simplecov sqlite3 + view_component view_component-form! BUNDLED WITH diff --git a/config.ru b/config.ru index 8a80573b..ec59e1b1 100644 --- a/config.ru +++ b/config.ru @@ -1,12 +1,11 @@ # frozen_string_literal: true +ENV["RAILS_ENV"] ||= "development" + require "rubygems" require "bundler" -Bundler.require :default, :development - -require "view_component/engine" -require "lookbook" +Bundler.require(:default, :development) Combustion.initialize! :all do config.logger = ActiveSupport::TaggedLogging.new(Logger.new(nil)) diff --git a/spec/internal/config/database.yml b/spec/internal/config/database.yml index b9781191..4110f496 100644 --- a/spec/internal/config/database.yml +++ b/spec/internal/config/database.yml @@ -1,3 +1,7 @@ +development: + adapter: sqlite3 + database: db/combustion_development.sqlite + test: adapter: sqlite3 database: db/combustion_test.sqlite