Merge branch 'refactor-dev-org-com-helper' into 'master'

Rename dev, org and com env detection helper

See merge request gitlab-org/gitlab-ee!15543

ee/app/models/ee/application_setting.rb

@@ -146,7 +146,7 @@ module EE
     end
 
     def should_check_namespace_plan?
-      check_namespace_plan? && (Rails.env.test? || ::Gitlab.dev_env_or_com?)
+      check_namespace_plan? && (Rails.env.test? || ::Gitlab.dev_env_org_or_com?)
     end
 
     def elasticsearch_indexing

ee/app/views/admin/application_settings/_availability_on_namespace_setting.html.haml

-- return unless ::Gitlab.dev_env_or_com?
+- return unless ::Gitlab.dev_env_org_or_com?
 
 - form = local_assigns.fetch(:form)
 

ee/spec/controllers/groups/billings_controller_spec.rb

@@ -9,7 +9,7 @@ describe Groups::BillingsController do
   describe 'GET index' do
     before do
       stub_application_setting(check_namespace_plan: true)
-      allow(Gitlab).to receive(:dev_env_or_com?) { true }
+      allow(Gitlab).to receive(:dev_env_org_or_com?) { true }
     end
 
     context 'authorized' do
@@ -48,7 +48,7 @@ describe Groups::BillingsController do
       end
 
       it 'renders 404 when it is not gitlab.com' do
-        allow(Gitlab).to receive(:dev_env_or_com?) { false }
+        allow(Gitlab).to receive(:dev_env_org_or_com?) { false }
         group.add_owner(user)
         sign_in(user)
 

ee/spec/models/application_setting_spec.rb

@@ -80,11 +80,11 @@ describe ApplicationSetting do
   describe '#should_check_namespace_plan?' do
     before do
       stub_application_setting(check_namespace_plan: check_namespace_plan_column)
-      allow(::Gitlab).to receive(:dev_env_or_com?) { gl_com }
+      allow(::Gitlab).to receive(:dev_env_org_or_com?) { gl_com }
 
-      # This stub was added in order to force a fallback to Gitlab.dev_env_or_com?
+      # This stub was added in order to force a fallback to Gitlab.dev_env_org_or_com?
       # call testing.
-      # Gitlab.dev_env_or_com? responds to `false` on test envs
+      # Gitlab.dev_env_org_or_com? responds to `false` on test envs
       # and we want to make sure we're still testing
       # should_check_namespace_plan? method through the test-suite (see
       # https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18461#note_69322821).

lib/gitlab.rb

@@ -55,7 +55,7 @@ module Gitlab
     SUBDOMAIN_REGEX === Gitlab.config.gitlab.url
   end
 
-  def self.dev_env_or_com?
+  def self.dev_env_org_or_com?
     Rails.env.development? || org? || com?
   end
 

spec/lib/gitlab_spec.rb

@@ -98,6 +98,33 @@ describe Gitlab do
     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
     before do
       described_class.instance_variable_set(:@is_ee, nil)