From 389f8f824909d60b7560248465416bd4bed92b6b Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Mon, 17 Apr 2017 18:16:32 -0400 Subject: Instance helper to replace site title helper (#2038) * Move site title helper to instance helper (name change only) * Remove newline in tag * Add site_hostname helper method to wrap up local_domain value * Use site_hostname helper in places that need local_domain value --- spec/helpers/instance_helper_spec.rb | 33 +++++++++++++++++++++++++++++++++ spec/helpers/site_title_helper_spec.rb | 15 --------------- 2 files changed, 33 insertions(+), 15 deletions(-) create mode 100644 spec/helpers/instance_helper_spec.rb delete mode 100644 spec/helpers/site_title_helper_spec.rb (limited to 'spec') diff --git a/spec/helpers/instance_helper_spec.rb b/spec/helpers/instance_helper_spec.rb new file mode 100644 index 000000000..c42ed6938 --- /dev/null +++ b/spec/helpers/instance_helper_spec.rb @@ -0,0 +1,33 @@ +# frozen_string_literal: true + +require 'rails_helper' + +describe InstanceHelper do + describe 'site_title' do + it 'Uses the Setting.site_title value when it exists' do + Setting.site_title = 'New site title' + + expect(helper.site_title).to eq 'New site title' + end + + it 'returns empty string when Setting.site_title is nil' do + Setting.site_title = nil + + expect(helper.site_title).to eq '' + end + end + + describe 'site_hostname' do + around(:each) do |example| + before = Rails.configuration.x.local_domain + example.run + Rails.configuration.x.local_domain = before + end + + it 'returns the local domain value' do + Rails.configuration.x.local_domain = 'example.com' + + expect(helper.site_hostname).to eq 'example.com' + end + end +end diff --git a/spec/helpers/site_title_helper_spec.rb b/spec/helpers/site_title_helper_spec.rb deleted file mode 100644 index 8cfd9cba1..000000000 --- a/spec/helpers/site_title_helper_spec.rb +++ /dev/null @@ -1,15 +0,0 @@ -require "rails_helper" - -describe "site_title" do - it "Uses the Setting.site_title value when it exists" do - Setting.site_title = "New site title" - - expect(helper.site_title).to eq "New site title" - end - - it "returns empty string when Setting.site_title is nil" do - Setting.site_title = nil - - expect(helper.site_title).to eq "" - end -end -- cgit