From 1b3bd1a2d8beb355c90d5112967afb9234887bf9 Mon Sep 17 00:00:00 2001 From: Stephen Hulme Date: Thu, 5 Oct 2023 13:32:11 +0100 Subject: [PATCH 1/9] feat: add more environment indicators to title and navbar --- app/frontend/stylesheets/all/header.scss | 6 +++ app/views/layouts/application.html.erb | 18 ++++++++- .../layouts/application.html.erb_spec.rb | 39 +++++++++++++++++++ 3 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 spec/views/layouts/application.html.erb_spec.rb diff --git a/app/frontend/stylesheets/all/header.scss b/app/frontend/stylesheets/all/header.scss index ea2ecab826..3dfa9e655a 100644 --- a/app/frontend/stylesheets/all/header.scss +++ b/app/frontend/stylesheets/all/header.scss @@ -23,6 +23,12 @@ body.production { } } +body.development { + .main-nav { + @extend .bg-secondary; + } +} + #app_name { padding: 0; font-size: 8px; diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 815117d9bb..ff544c8df9 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -17,7 +17,23 @@ - Sequencescape : <%= controller.controller_name.capitalize %> - <%= @page_name || controller.action_name %> + <% # Define a hash of environments + environments = { + cucumber: "🥒", + development: "🚧", + production: "🌎", + profile: "⏱️", + staging: "🚀", + staging_2: "🚀2️⃣", + test: "🧪", + training: "🎓", + } + + # Get an emoji for the current environment + current_environment = Rails.env.to_sym + emoji = environments[current_environment] || "❓" + %> + <%= "#{emoji}:" unless Rails.env.production? %> Sequencescape : <%= controller.controller_name.capitalize %> - <%= @page_name || controller.action_name %> <%= vite_client_tag %> diff --git a/spec/views/layouts/application.html.erb_spec.rb b/spec/views/layouts/application.html.erb_spec.rb new file mode 100644 index 0000000000..05d89408ce --- /dev/null +++ b/spec/views/layouts/application.html.erb_spec.rb @@ -0,0 +1,39 @@ +# frozen_string_literal: true + +require 'rails_helper' + +RSpec.describe 'layouts/application', type: :view do + environments = { + cucumber: "🥒", + development: "🚧", + # production is tested separately + profile: "⏱️", + staging: "🚀", + staging_2: "🚀2️⃣", + test: "🧪", + training: "🎓", + } + + environments.each do |env, emoji| + it "displays the correct title with #{emoji} for #{env} environment" do + allow(Rails).to receive(:env).and_return(ActiveSupport::StringInquirer.new(env.to_s)) + assign(:page_name, 'the homepage') + render + expect(rendered).to have_title("#{emoji}: Sequencescape : Test - the homepage") + end + end + + it 'displays the correct title without emoji in production environment' do + allow(Rails).to receive(:env).and_return(ActiveSupport::StringInquirer.new('production')) + assign(:page_name, 'the homepage') + render + expect(rendered).to have_title("Sequencescape : Test - the homepage") + end + + it 'displays the correct title with question mark emoji for undefined environment' do + allow(Rails).to receive(:env).and_return(ActiveSupport::StringInquirer.new('undefined_environment')) + assign(:page_name, 'the homepage') + render + expect(rendered).to have_title("❓: Sequencescape : Test - the homepage") + end +end From e1cdb427d8cd3fdd0611c88f85be0c42c7f92d6a Mon Sep 17 00:00:00 2001 From: Stephen Hulme Date: Thu, 5 Oct 2023 16:27:27 +0100 Subject: [PATCH 2/9] style: lint --- app/views/layouts/application.html.erb | 18 +++++++++--------- .../views/layouts/application.html.erb_spec.rb | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index ff544c8df9..026238ac4b 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -19,19 +19,19 @@ <% # Define a hash of environments environments = { - cucumber: "🥒", - development: "🚧", - production: "🌎", - profile: "⏱️", - staging: "🚀", - staging_2: "🚀2️⃣", - test: "🧪", - training: "🎓", + cucumber: '🥒', + development: '🚧', + production: '🌎', + profile: '⏱️', + staging: '🚀', + staging_2: '🚀2️⃣', # rubocop:disable Naming/VariableNumber + test: '🧪', + training: '🎓', } # Get an emoji for the current environment current_environment = Rails.env.to_sym - emoji = environments[current_environment] || "❓" + emoji = environments[current_environment] || '❓' %> <%= "#{emoji}:" unless Rails.env.production? %> Sequencescape : <%= controller.controller_name.capitalize %> - <%= @page_name || controller.action_name %> diff --git a/spec/views/layouts/application.html.erb_spec.rb b/spec/views/layouts/application.html.erb_spec.rb index 05d89408ce..ffdde08fc8 100644 --- a/spec/views/layouts/application.html.erb_spec.rb +++ b/spec/views/layouts/application.html.erb_spec.rb @@ -4,14 +4,14 @@ RSpec.describe 'layouts/application', type: :view do environments = { - cucumber: "🥒", - development: "🚧", + cucumber: '🥒', + development: '🚧', # production is tested separately - profile: "⏱️", - staging: "🚀", - staging_2: "🚀2️⃣", - test: "🧪", - training: "🎓", + profile: '⏱️', + staging: '🚀', + staging_2: '🚀2️⃣', # rubocop:disable Naming/VariableNumber + test: '🧪', + training: '🎓' } environments.each do |env, emoji| @@ -27,13 +27,13 @@ allow(Rails).to receive(:env).and_return(ActiveSupport::StringInquirer.new('production')) assign(:page_name, 'the homepage') render - expect(rendered).to have_title("Sequencescape : Test - the homepage") + expect(rendered).to have_title('Sequencescape : Test - the homepage') end it 'displays the correct title with question mark emoji for undefined environment' do allow(Rails).to receive(:env).and_return(ActiveSupport::StringInquirer.new('undefined_environment')) assign(:page_name, 'the homepage') render - expect(rendered).to have_title("❓: Sequencescape : Test - the homepage") + expect(rendered).to have_title('❓: Sequencescape : Test - the homepage') end end From 97bab5250596429b45a376b4dcadff352bfea593 Mon Sep 17 00:00:00 2001 From: Stephen Hulme Date: Mon, 16 Oct 2023 10:04:57 +0100 Subject: [PATCH 3/9] fix: removing unused staging_2 environment --- app/views/layouts/application.html.erb | 1 - spec/views/layouts/application.html.erb_spec.rb | 1 - 2 files changed, 2 deletions(-) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 026238ac4b..c86c7c3f16 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -24,7 +24,6 @@ production: '🌎', profile: '⏱️', staging: '🚀', - staging_2: '🚀2️⃣', # rubocop:disable Naming/VariableNumber test: '🧪', training: '🎓', } diff --git a/spec/views/layouts/application.html.erb_spec.rb b/spec/views/layouts/application.html.erb_spec.rb index ffdde08fc8..bf02cf6b01 100644 --- a/spec/views/layouts/application.html.erb_spec.rb +++ b/spec/views/layouts/application.html.erb_spec.rb @@ -9,7 +9,6 @@ # production is tested separately profile: '⏱️', staging: '🚀', - staging_2: '🚀2️⃣', # rubocop:disable Naming/VariableNumber test: '🧪', training: '🎓' } From be5c7130c7ec2e2296348ad67d8f57c04d565049 Mon Sep 17 00:00:00 2001 From: Stephen Hulme Date: Wed, 25 Oct 2023 15:40:16 +0100 Subject: [PATCH 4/9] fix: remove emoji indicators --- app/views/layouts/application.html.erb | 17 +-------- .../layouts/application.html.erb_spec.rb | 38 ------------------- 2 files changed, 1 insertion(+), 54 deletions(-) delete mode 100644 spec/views/layouts/application.html.erb_spec.rb diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index c86c7c3f16..815117d9bb 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -17,22 +17,7 @@ - <% # Define a hash of environments - environments = { - cucumber: '🥒', - development: '🚧', - production: '🌎', - profile: '⏱️', - staging: '🚀', - test: '🧪', - training: '🎓', - } - - # Get an emoji for the current environment - current_environment = Rails.env.to_sym - emoji = environments[current_environment] || '❓' - %> - <%= "#{emoji}:" unless Rails.env.production? %> Sequencescape : <%= controller.controller_name.capitalize %> - <%= @page_name || controller.action_name %> + Sequencescape : <%= controller.controller_name.capitalize %> - <%= @page_name || controller.action_name %> <%= vite_client_tag %> diff --git a/spec/views/layouts/application.html.erb_spec.rb b/spec/views/layouts/application.html.erb_spec.rb deleted file mode 100644 index bf02cf6b01..0000000000 --- a/spec/views/layouts/application.html.erb_spec.rb +++ /dev/null @@ -1,38 +0,0 @@ -# frozen_string_literal: true - -require 'rails_helper' - -RSpec.describe 'layouts/application', type: :view do - environments = { - cucumber: '🥒', - development: '🚧', - # production is tested separately - profile: '⏱️', - staging: '🚀', - test: '🧪', - training: '🎓' - } - - environments.each do |env, emoji| - it "displays the correct title with #{emoji} for #{env} environment" do - allow(Rails).to receive(:env).and_return(ActiveSupport::StringInquirer.new(env.to_s)) - assign(:page_name, 'the homepage') - render - expect(rendered).to have_title("#{emoji}: Sequencescape : Test - the homepage") - end - end - - it 'displays the correct title without emoji in production environment' do - allow(Rails).to receive(:env).and_return(ActiveSupport::StringInquirer.new('production')) - assign(:page_name, 'the homepage') - render - expect(rendered).to have_title('Sequencescape : Test - the homepage') - end - - it 'displays the correct title with question mark emoji for undefined environment' do - allow(Rails).to receive(:env).and_return(ActiveSupport::StringInquirer.new('undefined_environment')) - assign(:page_name, 'the homepage') - render - expect(rendered).to have_title('❓: Sequencescape : Test - the homepage') - end -end From 652f3f057941b25b6bccfa3ef483fdbd6a8634f4 Mon Sep 17 00:00:00 2001 From: Stephen Hulme Date: Wed, 25 Oct 2023 15:54:57 +0100 Subject: [PATCH 5/9] feat: change favicon based on environment --- app/helpers/application_helper.rb | 28 ++++++++++++ app/views/layouts/application.html.erb | 6 +-- app/views/layouts/sessions.html.erb | 6 +-- public/apple-icon-development.png | Bin 0 -> 6925 bytes public/apple-icon-staging.png | Bin 0 -> 7329 bytes public/apple-icon-training.png | Bin 0 -> 7424 bytes public/favicon-development.ico | Bin 0 -> 4286 bytes public/favicon-staging.ico | Bin 0 -> 4286 bytes public/favicon-training.ico | Bin 0 -> 4286 bytes spec/helpers/application_helper_spec.rb | 58 ++++++++++++++++++++++++ 10 files changed, 92 insertions(+), 6 deletions(-) create mode 100644 public/apple-icon-development.png create mode 100644 public/apple-icon-staging.png create mode 100644 public/apple-icon-training.png create mode 100644 public/favicon-development.ico create mode 100644 public/favicon-staging.ico create mode 100644 public/favicon-training.ico diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index f37839f87b..504328a3ce 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -34,6 +34,34 @@ def required_marker icon('fas', 'asterisk', class: 'text-warning', title: 'required') end + # Returns the appropriate icon suffix for the current environment + # Returns empty string for production + # Returns "-#{environment}" for training, staging + # Returns "-development" for any other environment + # @return [String] The suffix to append to the icon name + def icon_suffix + case Rails.env + when 'production' + '' + when 'training', 'staging' + "-#{Rails.env}" + else + '-development' + end + end + + # Return the appropriate favicon for the current environment + # @return [String] The path to the favicon + def favicon + "favicon#{icon_suffix}.ico" + end + + # Return the appropriate apple icon for the current environment + # @return [String] The path to the apple icon + def apple_icon + "apple-icon#{icon_suffix}.png" + end + def render_flashes flash.each do |key, message| concat(alert(key, id: "message_#{key}") { Array(message).each { |m| concat tag.div(m) } }) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 815117d9bb..b3317eb724 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -33,9 +33,9 @@ <% end %> <% end %> <%= csrf_meta_tags %> - - - + + + diff --git a/app/views/layouts/sessions.html.erb b/app/views/layouts/sessions.html.erb index c521505ab5..4315ee7aba 100644 --- a/app/views/layouts/sessions.html.erb +++ b/app/views/layouts/sessions.html.erb @@ -7,9 +7,9 @@ <%= vite_stylesheet_tag "application.scss", media: "all" %> Sequencescape : <%= I18n.t('global_links.login') %> - - - + + + <% if Rails.application.config.disable_animations %> <%= vite_stylesheet_tag 'disable_animations' %> diff --git a/public/apple-icon-development.png b/public/apple-icon-development.png new file mode 100644 index 0000000000000000000000000000000000000000..a815f80d0bae77e93ff691193a6c99efa7ceb30f GIT binary patch literal 6925 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 RJHR(B$lSydUxafB{U5RwEcgHb literal 0 HcmV?d00001 diff --git a/public/apple-icon-staging.png b/public/apple-icon-staging.png new file mode 100644 index 0000000000000000000000000000000000000000..b84d59aef799375132749b08a9115091bbe48ddb GIT binary patch literal 7329 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 G*}nk?t9Hl$ literal 0 HcmV?d00001 diff --git a/public/favicon-training.ico b/public/favicon-training.ico new file mode 100644 index 0000000000000000000000000000000000000000..dd60851a845a753e0115af0c209f76c224932154 GIT binary patch literal 4286 zcmeI0Yfw~W7{^ba`vS}E!rozTP$)XnFwWR$G)**)Ib+mJ7zDb+#vp@OlZD(Rqqqc` zWU#=pCT5uBNEi-kk}@e^qO5?B+@!dpJ3xqR{d?X6G-+J40r!i$^E=Nu@8$o0&-*;* z?96i96ZCa==h%@u?8I?mj^n%tYU2C|*3N&ZPw?avQwC{MWHM<9R%tx^hvT8|J?3L)v46B5<<^r3vAhM31h45lJy?EJ^v>OU+=xv_ zLlOL~0b5UOhpDCr?YBD6Ve7<4molI&@qyxiC*%k8P*^Bh=zV3@Lt|bBU-KHoo=!x4 z&sB^~jG?aUGTtz60n6c3z0AE1ZIU+<%Tu8$eu~#qm`R&-Syb%TBlwsBKX+Zk^;@kl zo{56);0nHN|DSeLtz@}irr-1pGKMIiI|G_VC`>2Rrh&>oD7G~;saSB>CTLwi8M!=uSLL-O*qqj z7DImwqxix>JeU0<|GUO&I;eOvs%})n+SiC}q^r*JhO)pDGLvp@=-yTou0q;R8E7Bw zz{TEL#8;Ibf%;A$~;o=-x=sc3{$gd^hg zHYA+eg@T4+v=07CH9d*j<2L?T8oN7&3%}Lio2KtzsV~7-)>1y#(p>U?81|^)XMPC@ zl_@A|K7nfkjp(*@qi3WSHz{7De3dnoBdIbKYt8K75p9dBF8kcS!cC{~5>h*)?mI(s*T# zCsZ^?zDEa1j(SmGYvI@PfO^bZmZgDPCe3pI%v<^~?Ma%-Auw;rZpzh%Xqn~+;*X4hxl!WbC@(bT`hI7hqv$Aftbqoi<-bX!uKwz|%$&%9kCByf6L zd=JhMuJ>Hu-@iE5BJy^H&?tpd82LXkMC2uebC>`UqY#1V!4QPe{u^kImIN{BGDL(B W0)q?024^V9-;f@Nng0PC75@hPdWjDJ literal 0 HcmV?d00001 diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb index 80407c906a..597535de15 100644 --- a/spec/helpers/application_helper_spec.rb +++ b/spec/helpers/application_helper_spec.rb @@ -5,6 +5,64 @@ require './app/helpers/application_helper' describe ApplicationHelper do + describe '#favicon' do + subject(:favicon) { helper.favicon } + + it 'returns the favicon path for the production environment' do + allow(Rails).to receive(:env).and_return('production'.inquiry) + expect(favicon).to eq('favicon.ico') + end + + it 'returns the favicon path for the training environment' do + allow(Rails).to receive(:env).and_return('training'.inquiry) + expect(favicon).to eq('favicon-training.ico') + end + + it 'returns the favicon path for the staging environment' do + allow(Rails).to receive(:env).and_return('staging'.inquiry) + expect(favicon).to eq('favicon-staging.ico') + end + + it 'returns the favicon path for the development environment' do + allow(Rails).to receive(:env).and_return('development'.inquiry) + expect(favicon).to eq('favicon-development.ico') + end + + it 'returns the favicon path for an unknown environment' do + allow(Rails).to receive(:env).and_return('unknown'.inquiry) + expect(favicon).to eq('favicon-development.ico') + end + end + + describe '#apple_icon' do + subject(:apple_icon) { helper.apple_icon } + + it 'returns the apple icon path for the production environment' do + allow(Rails).to receive(:env).and_return('production'.inquiry) + expect(apple_icon).to eq('apple-icon.png') + end + + it 'returns the apple icon path for the training environment' do + allow(Rails).to receive(:env).and_return('training'.inquiry) + expect(apple_icon).to eq('apple-icon-training.png') + end + + it 'returns the apple icon path for the staging environment' do + allow(Rails).to receive(:env).and_return('staging'.inquiry) + expect(apple_icon).to eq('apple-icon-staging.png') + end + + it 'returns the apple icon path for the development environment' do + allow(Rails).to receive(:env).and_return('development'.inquiry) + expect(apple_icon).to eq('apple-icon-development.png') + end + + it 'returns the apple icon path for an unknown environment' do + allow(Rails).to receive(:env).and_return('unknown'.inquiry) + expect(apple_icon).to eq('apple-icon-development.png') + end + end + describe '#render_parsed_json' do subject(:returned_html) { render_parsed_json(json) } From 6f1e363b0c8a419247f52d5ce06e6e061488e3a4 Mon Sep 17 00:00:00 2001 From: Stephen Hulme Date: Thu, 26 Oct 2023 11:19:09 +0100 Subject: [PATCH 6/9] refactor: declaritively implement nav-bar environment colour change --- app/frontend/stylesheets/all/colours.scss | 6 ++++++ app/frontend/stylesheets/all/components.scss | 14 ++++++++++++++ app/frontend/stylesheets/all/header.scss | 15 ++++++++++----- 3 files changed, 30 insertions(+), 5 deletions(-) diff --git a/app/frontend/stylesheets/all/colours.scss b/app/frontend/stylesheets/all/colours.scss index b46ffd06ec..82022fede9 100644 --- a/app/frontend/stylesheets/all/colours.scss +++ b/app/frontend/stylesheets/all/colours.scss @@ -1,3 +1,9 @@ +/* Colours defined per environment */ +$production: $primary !default; +$training: $green !default; +$staging: $red !default; +$development: $gray-600 !default; + @mixin colour-badge($base_colour, $text_colour) { background-color: $base_colour; color: $text_colour; diff --git a/app/frontend/stylesheets/all/components.scss b/app/frontend/stylesheets/all/components.scss index 53fcc702b4..6016d19f15 100644 --- a/app/frontend/stylesheets/all/components.scss +++ b/app/frontend/stylesheets/all/components.scss @@ -2,6 +2,20 @@ * Please ensure you keep it commented */ +/* Background colours for different environments */ +.bg-production { + background-color: $production; +} +.bg-training { + background-color: $training; +} +.bg-staging { + background-color: $staging; +} +.bg-development { + background-color: $development; +} + /* A Summary table presents simple key-value pairs */ .table-summary th { text-align: right; diff --git a/app/frontend/stylesheets/all/header.scss b/app/frontend/stylesheets/all/header.scss index 3dfa9e655a..3b89052d26 100644 --- a/app/frontend/stylesheets/all/header.scss +++ b/app/frontend/stylesheets/all/header.scss @@ -4,7 +4,7 @@ .main-nav { @extend .navbar; @extend .navbar-dark; - @extend .bg-danger; + @extend .bg-development; // development and unknown environments @extend .navbar-expand-lg; #logo_container { @@ -17,15 +17,20 @@ } } +// Set the background color of the navbar based on the environment body.production { .main-nav { - @extend .bg-primary; + @extend .bg-production; } } - -body.development { +body.training { + .main-nav { + @extend .bg-training; + } +} +body.staging { .main-nav { - @extend .bg-secondary; + @extend .bg-staging; } } From ef4f1f123c712790559469c72d61aa9cdebe090f Mon Sep 17 00:00:00 2001 From: Stephen Hulme Date: Thu, 26 Oct 2023 11:21:57 +0100 Subject: [PATCH 7/9] style: lint --- app/frontend/stylesheets/all/colours.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/frontend/stylesheets/all/colours.scss b/app/frontend/stylesheets/all/colours.scss index 82022fede9..3eaabf04d0 100644 --- a/app/frontend/stylesheets/all/colours.scss +++ b/app/frontend/stylesheets/all/colours.scss @@ -1,8 +1,8 @@ /* Colours defined per environment */ -$production: $primary !default; -$training: $green !default; -$staging: $red !default; -$development: $gray-600 !default; +$production: $primary !default; +$training: $green !default; +$staging: $red !default; +$development: $gray-600 !default; @mixin colour-badge($base_colour, $text_colour) { background-color: $base_colour; From b52f58c292f5609fe314c11974100feb35bd6269 Mon Sep 17 00:00:00 2001 From: Stephen Hulme Date: Thu, 26 Oct 2023 11:35:42 +0100 Subject: [PATCH 8/9] style: lint inquiry --- spec/helpers/application_helper_spec.rb | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb index 597535de15..93b2acb08f 100644 --- a/spec/helpers/application_helper_spec.rb +++ b/spec/helpers/application_helper_spec.rb @@ -9,27 +9,27 @@ subject(:favicon) { helper.favicon } it 'returns the favicon path for the production environment' do - allow(Rails).to receive(:env).and_return('production'.inquiry) + allow(Rails).to receive(:env).and_return('production') expect(favicon).to eq('favicon.ico') end it 'returns the favicon path for the training environment' do - allow(Rails).to receive(:env).and_return('training'.inquiry) + allow(Rails).to receive(:env).and_return('training') expect(favicon).to eq('favicon-training.ico') end it 'returns the favicon path for the staging environment' do - allow(Rails).to receive(:env).and_return('staging'.inquiry) + allow(Rails).to receive(:env).and_return('staging') expect(favicon).to eq('favicon-staging.ico') end it 'returns the favicon path for the development environment' do - allow(Rails).to receive(:env).and_return('development'.inquiry) + allow(Rails).to receive(:env).and_return('development') expect(favicon).to eq('favicon-development.ico') end it 'returns the favicon path for an unknown environment' do - allow(Rails).to receive(:env).and_return('unknown'.inquiry) + allow(Rails).to receive(:env).and_return('unknown') expect(favicon).to eq('favicon-development.ico') end end @@ -38,27 +38,27 @@ subject(:apple_icon) { helper.apple_icon } it 'returns the apple icon path for the production environment' do - allow(Rails).to receive(:env).and_return('production'.inquiry) + allow(Rails).to receive(:env).and_return('production') expect(apple_icon).to eq('apple-icon.png') end it 'returns the apple icon path for the training environment' do - allow(Rails).to receive(:env).and_return('training'.inquiry) + allow(Rails).to receive(:env).and_return('training') expect(apple_icon).to eq('apple-icon-training.png') end it 'returns the apple icon path for the staging environment' do - allow(Rails).to receive(:env).and_return('staging'.inquiry) + allow(Rails).to receive(:env).and_return('staging') expect(apple_icon).to eq('apple-icon-staging.png') end it 'returns the apple icon path for the development environment' do - allow(Rails).to receive(:env).and_return('development'.inquiry) + allow(Rails).to receive(:env).and_return('development') expect(apple_icon).to eq('apple-icon-development.png') end it 'returns the apple icon path for an unknown environment' do - allow(Rails).to receive(:env).and_return('unknown'.inquiry) + allow(Rails).to receive(:env).and_return('unknown') expect(apple_icon).to eq('apple-icon-development.png') end end From 48d15c6da28a6100ea0024d7fe4a195f63de84e0 Mon Sep 17 00:00:00 2001 From: Stephen Hulme Date: Thu, 26 Oct 2023 11:48:28 +0100 Subject: [PATCH 9/9] refactor: use internal environment variable --- app/helpers/application_helper.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index c1a3706060..5734a49b38 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -40,11 +40,12 @@ def required_marker # Returns "-development" for any other environment # @return [String] The suffix to append to the icon name def icon_suffix - case Rails.env + environment = Rails.env + case environment when 'production' '' when 'training', 'staging' - "-#{Rails.env}" + "-#{environment}" else '-development' end