From 2777db159748e5d83fe9b7b2626955fd5f4e3230 Mon Sep 17 00:00:00 2001 From: Faustino Aguilar Date: Sat, 26 May 2018 12:37:51 -0500 Subject: [PATCH 1/4] Remove Granite.settings.logger from spec --- src/amber/cli/templates/app/spec/spec_helper.cr | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/amber/cli/templates/app/spec/spec_helper.cr b/src/amber/cli/templates/app/spec/spec_helper.cr index 7d59216eb..33aa94dfc 100644 --- a/src/amber/cli/templates/app/spec/spec_helper.cr +++ b/src/amber/cli/templates/app/spec/spec_helper.cr @@ -11,9 +11,6 @@ Micrate::DB.connection_url = Amber.settings.database_url # Automatically run migrations on the test database Micrate::Cli.run_up -# Disable query logger for tests -Granite.settings.logger = Logger.new nil - module Spec DRIVER = :chrome PATH = "/usr/local/bin/chromedriver" From 6deaf8112d5f3bdf15babe08b512cefeccd9730a Mon Sep 17 00:00:00 2001 From: Faustino Aguilar Date: Sat, 16 Jun 2018 08:57:51 -0500 Subject: [PATCH 2/4] Add spec_helper template --- .../templates/app/spec/{spec_helper.cr => spec_helper.cr.ecr} | 4 ++++ 1 file changed, 4 insertions(+) rename src/amber/cli/templates/app/spec/{spec_helper.cr => spec_helper.cr.ecr} (93%) diff --git a/src/amber/cli/templates/app/spec/spec_helper.cr b/src/amber/cli/templates/app/spec/spec_helper.cr.ecr similarity index 93% rename from src/amber/cli/templates/app/spec/spec_helper.cr rename to src/amber/cli/templates/app/spec/spec_helper.cr.ecr index 33aa94dfc..e266cda6e 100644 --- a/src/amber/cli/templates/app/spec/spec_helper.cr +++ b/src/amber/cli/templates/app/spec/spec_helper.cr.ecr @@ -11,6 +11,10 @@ Micrate::DB.connection_url = Amber.settings.database_url # Automatically run migrations on the test database Micrate::Cli.run_up +<%- if database == "granite" %> +Granite.settings.logger = Logger.new nil +<% end %> + module Spec DRIVER = :chrome PATH = "/usr/local/bin/chromedriver" From d6586d15ac0b7c4752e7b8b00b4b2fcedf4b3d39 Mon Sep 17 00:00:00 2001 From: Faustino Aguilar Date: Sat, 16 Jun 2018 09:10:20 -0500 Subject: [PATCH 3/4] Remove spaces and add comment --- src/amber/cli/templates/app/spec/spec_helper.cr.ecr | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/amber/cli/templates/app/spec/spec_helper.cr.ecr b/src/amber/cli/templates/app/spec/spec_helper.cr.ecr index e266cda6e..eaaf25cdb 100644 --- a/src/amber/cli/templates/app/spec/spec_helper.cr.ecr +++ b/src/amber/cli/templates/app/spec/spec_helper.cr.ecr @@ -11,9 +11,10 @@ Micrate::DB.connection_url = Amber.settings.database_url # Automatically run migrations on the test database Micrate::Cli.run_up -<%- if database == "granite" %> +<%- if database == "granite" -%> +# Disable Granite logs in tests Granite.settings.logger = Logger.new nil -<% end %> +<%- end -%> module Spec DRIVER = :chrome From b9a9eb388a6e63748e33431bd65493d1e017a44a Mon Sep 17 00:00:00 2001 From: Faustino Aguilar Date: Tue, 19 Jun 2018 22:06:58 -0500 Subject: [PATCH 4/4] Use instance var --- src/amber/cli/templates/app/spec/spec_helper.cr.ecr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/amber/cli/templates/app/spec/spec_helper.cr.ecr b/src/amber/cli/templates/app/spec/spec_helper.cr.ecr index eaaf25cdb..d3763eaf9 100644 --- a/src/amber/cli/templates/app/spec/spec_helper.cr.ecr +++ b/src/amber/cli/templates/app/spec/spec_helper.cr.ecr @@ -11,7 +11,7 @@ Micrate::DB.connection_url = Amber.settings.database_url # Automatically run migrations on the test database Micrate::Cli.run_up -<%- if database == "granite" -%> +<%- if @database == "granite" -%> # Disable Granite logs in tests Granite.settings.logger = Logger.new nil <%- end -%>