Commit fa674fa5 authored by Doug Stull's avatar Doug Stull Committed by Ash McKenzie

Rename dev, org, com helper

parent 6308c0ab
...@@ -55,7 +55,7 @@ module Gitlab ...@@ -55,7 +55,7 @@ module Gitlab
SUBDOMAIN_REGEX === Gitlab.config.gitlab.url SUBDOMAIN_REGEX === Gitlab.config.gitlab.url
end end
def self.dev_env_or_com? def self.dev_env_org_or_com?
Rails.env.development? || org? || com? Rails.env.development? || org? || com?
end end
......
...@@ -98,6 +98,33 @@ describe Gitlab do ...@@ -98,6 +98,33 @@ describe Gitlab do
end end
end end
describe '.dev_env_org_or_com?' do
it 'is true when on .com' do
allow(described_class).to receive_messages(com?: true, org?: false)
expect(described_class.dev_env_org_or_com?).to eq true
end
it 'is true when org' do
allow(described_class).to receive_messages(com?: false, org?: true)
expect(described_class.dev_env_org_or_com?).to eq true
end
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'))
expect(described_class.dev_env_org_or_com?).to eq true
end
it 'is false when not dev, org or com' do
allow(described_class).to receive_messages(com?: false, org?: false)
expect(described_class.dev_env_org_or_com?).to eq false
end
end
describe '.ee?' do describe '.ee?' do
before do before do
described_class.instance_variable_set(:@is_ee, nil) described_class.instance_variable_set(:@is_ee, nil)
......
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