Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2016-01-05 22:54:59 +0300
committerRobert Speicher <rspeicher@gmail.com>2016-01-05 22:54:59 +0300
commit43053c2e6f03ad60f85728f36c46588979f68024 (patch)
tree36c7234134d76bc98092973c3f0b6774e049490b /spec/helpers/page_layout_helper_spec.rb
parenta298f694327b1241fc0d06618228e3750c20c5a1 (diff)
Make `page_description` less magical :sparkles:
Diffstat (limited to 'spec/helpers/page_layout_helper_spec.rb')
-rw-r--r--spec/helpers/page_layout_helper_spec.rb27
1 files changed, 2 insertions, 25 deletions
diff --git a/spec/helpers/page_layout_helper_spec.rb b/spec/helpers/page_layout_helper_spec.rb
index 83aeafcf31a..a097786ba6d 100644
--- a/spec/helpers/page_layout_helper_spec.rb
+++ b/spec/helpers/page_layout_helper_spec.rb
@@ -2,8 +2,8 @@ require 'rails_helper'
describe PageLayoutHelper do
describe 'page_description' do
- it 'defaults to value returned by page_description_default helper' do
- allow(helper).to receive(:page_description_default).and_return('Foo')
+ it 'defaults to value returned by brand_title helper' do
+ allow(helper).to receive(:brand_title).and_return('Foo')
expect(helper.page_description).to eq 'Foo'
end
@@ -42,29 +42,6 @@ describe PageLayoutHelper do
end
end
- describe 'page_description_default' do
- it 'uses Project description when available' do
- project = double(description: 'Project Description')
- assign(:project, project)
-
- expect(helper.page_description_default).to eq 'Project Description'
- end
-
- it 'uses brand_title when Project description is nil' do
- project = double(description: nil)
- assign(:project, project)
-
- expect(helper).to receive(:brand_title).and_return('Brand Title')
- expect(helper.page_description_default).to eq 'Brand Title'
- end
-
- it 'falls back to brand_title' do
- allow(helper).to receive(:brand_title).and_return('Brand Title')
-
- expect(helper.page_description_default).to eq 'Brand Title'
- end
- end
-
describe 'page_image' do
it 'defaults to the GitLab logo' do
expect(helper.page_image).to end_with 'assets/gitlab_logo.png'