diff options
author | Ash McKenzie <amckenzie@gitlab.com> | 2019-08-28 04:53:46 +0300 |
---|---|---|
committer | Ash McKenzie <amckenzie@gitlab.com> | 2019-08-28 05:01:44 +0300 |
commit | d5dc50392df3eff21a0b2771174f89f54e0b15f8 (patch) | |
tree | 026102acf382338f60ecbc97090877c6bf0ea139 /spec | |
parent | 834f7861e57769d47ebf4dc7ac6b57b39064f8fc (diff) |
Use new RailsHelpers module
Diffstat (limited to 'spec')
-rw-r--r-- | spec/lib/gitlab/favicon_spec.rb | 8 | ||||
-rw-r--r-- | spec/lib/gitlab_spec.rb | 8 |
2 files changed, 9 insertions, 7 deletions
diff --git a/spec/lib/gitlab/favicon_spec.rb b/spec/lib/gitlab/favicon_spec.rb index dce56bbd2c4..965726980b5 100644 --- a/spec/lib/gitlab/favicon_spec.rb +++ b/spec/lib/gitlab/favicon_spec.rb @@ -1,14 +1,16 @@ require 'rails_helper' RSpec.describe Gitlab::Favicon, :request_store do + include RailsHelpers + describe '.main' do it 'defaults to favicon.png' do - allow(Rails).to receive(:env).and_return(ActiveSupport::StringInquirer.new('production')) + stub_rails_env('production') expect(described_class.main).to match_asset_path '/assets/favicon.png' end it 'has blue favicon for development', unless: Gitlab.ee? do - allow(Rails).to receive(:env).and_return(ActiveSupport::StringInquirer.new('development')) + stub_rails_env('development') expect(described_class.main).to match_asset_path '/assets/favicon-blue.png' end @@ -24,7 +26,7 @@ RSpec.describe Gitlab::Favicon, :request_store do context 'asset host' do before do - allow(Rails).to receive(:env).and_return(ActiveSupport::StringInquirer.new('production')) + stub_rails_env('production') end it 'returns a relative url when the asset host is not configured' do diff --git a/spec/lib/gitlab_spec.rb b/spec/lib/gitlab_spec.rb index 1fc363460ae..74d4b12a070 100644 --- a/spec/lib/gitlab_spec.rb +++ b/spec/lib/gitlab_spec.rb @@ -1,10 +1,10 @@ # frozen_string_literal: true -require 'fast_spec_helper' - -require_dependency 'gitlab' +require 'spec_helper' describe Gitlab do + include RailsHelpers + describe '.root' do it 'returns the root path of the app' do expect(described_class.root).to eq(Pathname.new(File.expand_path('../..', __dir__))) @@ -113,7 +113,7 @@ describe Gitlab do it 'is true when dev env' do allow(described_class).to receive_messages(com?: false, org?: false) - allow(Rails).to receive(:env).and_return(ActiveSupport::StringInquirer.new('development')) + stub_rails_env('development') expect(described_class.dev_env_org_or_com?).to eq true end |