Merge pull request #366 from aha-oida/enhance_stylesheet_default_config

Enable stylesheet in config for custom and test

Author: whotwagner

app/views/layout.erb

@@ -10,9 +10,9 @@
 
     <title><%= html_title(custom:AppConfig.custom['html_title'], content: AppConfig.custom['html_title_string']) %></title>
     <link rel="stylesheet" type="text/css" href="<%= stylesheet_path 'application' %>" />
-    <%# if AppConfig.custom['stylesheet'] %>
+    <% if AppConfig.custom['stylesheet'] %>
       <link rel="stylesheet" type="text/css" href="<%= stylesheet_path 'custom' %>" />
-    <%# end %>
+    <% end %>
 
     <%#= csp_meta_tag %>
 

config/config.yml

@@ -31,7 +31,7 @@ production:
   # base_url: "https://example.com" # set to your production URL
   cleanup_schedule: "10m"
   custom:
-    stylesheet: false
+    stylesheet: true
     html_title: false # possible values: false, replace, append
     html_title_string: custom-title
     meta_description: false # possible values: false, replace, append
@@ -46,7 +46,7 @@ development:
 test:
   <<: *common_settings
   custom:
-    stylesheet: false
+    stylesheet: true
     html_title: false
     html_title_string: test-title
     meta_description: false

db/structure.sql

@@ -1,4 +1,4 @@
-CREATE TABLE IF NOT EXISTS "bins" ("payload" text, "created_at" datetime(6) NOT NULL, "updated_at" datetime(6) NOT NULL, "id" varchar, "expire_date" datetime(6) DEFAULT (datetime('now','+7 day','localtime')), "has_password" boolean DEFAULT 0);
+CREATE TABLE IF NOT EXISTS "bins" ("payload" text, "created_at" datetime(6) NOT NULL, "updated_at" datetime(6) NOT NULL, "id" varchar, "expire_date" datetime(6) DEFAULT (datetime('now','+7 day','localtime')), "has_password" boolean DEFAULT FALSE);
 CREATE UNIQUE INDEX "index_bins_on_id" ON "bins" ("id");
 CREATE TABLE IF NOT EXISTS "schema_migrations" ("version" varchar NOT NULL PRIMARY KEY);
 CREATE TABLE IF NOT EXISTS "ar_internal_metadata" ("key" varchar NOT NULL PRIMARY KEY, "value" varchar, "created_at" datetime(6) NOT NULL, "updated_at" datetime(6) NOT NULL);

public/stylesheets/custom.css

@@ -1,3 +1,5 @@
+/* 
 #titlebar {
 	background: red;
 }
+*/

spec/lib/app_config_spec.rb

@@ -33,13 +33,13 @@ def stub_config(overrides = {})
   it 'loads the test environment config with fallback to default' do
     AppConfig.load!
     expect(AppConfig.cleanup_schedule).to eq(AppConfig::Accessors::DEFAULT_CLEANUP_SCHEDULE)
-    expect(AppConfig.custom['stylesheet']).to eq(false)
+    expect(AppConfig.custom['stylesheet']).to eq(true)
   end
 
   it 'loads custom config available as a hash' do
     AppConfig.load!
     expect(AppConfig.custom).to be_a(Hash)
-    expect(AppConfig.custom['stylesheet']).to eq(false)
+    expect(AppConfig.custom['stylesheet']).to eq(true)
   end
 
   it 'responds to known config keys' do