[#460] Revisit and set the default value for some environment variabl…

…es (#511) * Add default value for MAILER_DEFAULT_HOST * Add default value for MAILER_DEFAULT_PORT * Add default value for AVAILABLE_LOCALES
nimblehq · Apr 29, 2024 · 07447c3 · 07447c3
1 parent 0102560
commit 07447c3
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 22 deletions.
diff --git a/.template/spec/base/config/environments/development_spec.rb b/.template/spec/base/config/environments/development_spec.rb
@@ -8,7 +8,7 @@
   end
 
   it 'configures the mailer asset host' do
-    expect(subject).to contain("config.action_mailer.asset_host = ENV.fetch('MAILER_DEFAULT_HOST')")
+    expect(subject).to contain("config.action_mailer.asset_host = ENV.fetch('MAILER_DEFAULT_HOST', 'localhost')")
   end
 
   it 'configures the mailer default url options' do
@@ -24,8 +24,8 @@
   def mailer_default_url_config
     <<~RUBY
       config.action_mailer.default_url_options = {
-        host: ENV.fetch('MAILER_DEFAULT_HOST'),
-        port: ENV.fetch('MAILER_DEFAULT_PORT')
+        host: ENV.fetch('MAILER_DEFAULT_HOST', 'localhost'),
+        port: ENV.fetch('MAILER_DEFAULT_PORT', '3000')
       }
     RUBY
   end

diff --git a/.template/spec/base/config/environments/production_spec.rb b/.template/spec/base/config/environments/production_spec.rb
@@ -4,7 +4,7 @@
   subject { file('config/environments/production.rb') }
 
   it 'configures the mailer asset host' do
-    expect(subject).to contain("config.action_mailer.asset_host = ENV.fetch('MAILER_DEFAULT_HOST')")
+    expect(subject).to contain("config.action_mailer.asset_host = ENV.fetch('MAILER_DEFAULT_HOST', 'localhost')")
   end
 
   it 'configures the mailer default url options' do
@@ -24,22 +24,22 @@
   def mailer_default_url_config
     <<~RUBY
       config.action_mailer.default_url_options = {
-        host: ENV.fetch('MAILER_DEFAULT_HOST'),
-        port: ENV.fetch('MAILER_DEFAULT_PORT')
+        host: ENV.fetch('MAILER_DEFAULT_HOST', 'localhost'),
+        port: ENV.fetch('MAILER_DEFAULT_PORT', '3000')
       }
     RUBY
   end
 
   def i18n_config
     <<~RUBY
       # eg: AVAILABLE_LOCALES = 'en,th'
-      config.i18n.available_locales = ENV.fetch('AVAILABLE_LOCALES').split(',')
+      config.i18n.available_locales = ENV.fetch('AVAILABLE_LOCALES', 'en').split(',')
 
       # eg: DEFAULT_LOCALE = 'en'
-      config.i18n.default_locale = ENV.fetch('DEFAULT_LOCALE')
+      config.i18n.default_locale = ENV.fetch('DEFAULT_LOCALE', 'en')
 
       # eg: FALLBACK_LOCALES = 'en,th'
-      config.i18n.fallbacks = ENV.fetch('FALLBACK_LOCALES').split(',')
+      config.i18n.fallbacks = ENV.fetch('FALLBACK_LOCALES', 'en').split(',')
     RUBY
   end
 end
diff --git a/.template/spec/base/config/environments/test_spec.rb b/.template/spec/base/config/environments/test_spec.rb
@@ -20,8 +20,8 @@
   def mailer_default_url_config
     <<~RUBY
       config.action_mailer.default_url_options = {
-        host: ENV.fetch('MAILER_DEFAULT_HOST'),
-        port: ENV.fetch('MAILER_DEFAULT_PORT')
+        host: ENV.fetch('MAILER_DEFAULT_HOST', 'localhost'),
+        port: ENV.fetch('MAILER_DEFAULT_PORT', '3000')
       }
     RUBY
   end

diff --git a/config/environments/development.rb b/config/environments/development.rb
@@ -5,11 +5,11 @@
 
     config.action_mailer.delivery_method = :letter_opener
 
-    config.action_mailer.asset_host = ENV.fetch('MAILER_DEFAULT_HOST')
+    config.action_mailer.asset_host = ENV.fetch('MAILER_DEFAULT_HOST', 'localhost')
 
     config.action_mailer.default_url_options = {
-      host: ENV.fetch('MAILER_DEFAULT_HOST'),
-      port: ENV.fetch('MAILER_DEFAULT_PORT')
+      host: ENV.fetch('MAILER_DEFAULT_HOST', 'localhost'),
+      port: ENV.fetch('MAILER_DEFAULT_PORT', '3000')
     }
   RUBY
 end

diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -6,11 +6,11 @@
 insert_into_file 'config/environments/production.rb', after: /config.action_mailer.perform_caching.+\n/ do
   <<~RUBY.indent(2)
 
-    config.action_mailer.asset_host = ENV.fetch('MAILER_DEFAULT_HOST')
+    config.action_mailer.asset_host = ENV.fetch('MAILER_DEFAULT_HOST', 'localhost')
 
     config.action_mailer.default_url_options = {
-      host: ENV.fetch('MAILER_DEFAULT_HOST'),
-      port: ENV.fetch('MAILER_DEFAULT_PORT')
+      host: ENV.fetch('MAILER_DEFAULT_HOST', 'localhost'),
+      port: ENV.fetch('MAILER_DEFAULT_PORT', '3000')
     }
   RUBY
 end
@@ -23,13 +23,13 @@
 environment do
   <<~RUBY
     # eg: AVAILABLE_LOCALES = 'en,th'
-    config.i18n.available_locales = ENV.fetch('AVAILABLE_LOCALES').split(',')
+    config.i18n.available_locales = ENV.fetch('AVAILABLE_LOCALES', 'en').split(',')
 
     # eg: DEFAULT_LOCALE = 'en'
-    config.i18n.default_locale = ENV.fetch('DEFAULT_LOCALE')
+    config.i18n.default_locale = ENV.fetch('DEFAULT_LOCALE', 'en')
 
     # eg: FALLBACK_LOCALES = 'en,th'
-    config.i18n.fallbacks = ENV.fetch('FALLBACK_LOCALES').split(',')
+    config.i18n.fallbacks = ENV.fetch('FALLBACK_LOCALES', 'en').split(',')
 
   RUBY
 end
diff --git a/config/environments/test.rb b/config/environments/test.rb
@@ -4,8 +4,8 @@
   <<~RUBY.indent(2)
 
     config.action_mailer.default_url_options = {
-      host: ENV.fetch('MAILER_DEFAULT_HOST'),
-      port: ENV.fetch('MAILER_DEFAULT_PORT')
+      host: ENV.fetch('MAILER_DEFAULT_HOST', 'localhost'),
+      port: ENV.fetch('MAILER_DEFAULT_PORT', '3000')
     }
   RUBY
 end