Commit 568999e6 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'single-codebase-favicon-specs-ce' into 'master'

EE Backport to CE of EE!12404

See merge request gitlab-org/gitlab-ce!28292
parents 99637084 e48305c0
...@@ -7,7 +7,7 @@ RSpec.describe Gitlab::Favicon, :request_store do ...@@ -7,7 +7,7 @@ RSpec.describe Gitlab::Favicon, :request_store do
expect(described_class.main).to match_asset_path '/assets/favicon.png' expect(described_class.main).to match_asset_path '/assets/favicon.png'
end end
it 'has blue favicon for development' do it 'has blue favicon for development', unless: Gitlab.ee? do
allow(Rails).to receive(:env).and_return(ActiveSupport::StringInquirer.new('development')) allow(Rails).to receive(:env).and_return(ActiveSupport::StringInquirer.new('development'))
expect(described_class.main).to match_asset_path '/assets/favicon-blue.png' expect(described_class.main).to match_asset_path '/assets/favicon-blue.png'
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment