Add latest changes from gitlab-org/gitlab@master

1 files changed, 18 insertions, 2 deletions

diff --git a/spec/lib/gitlab/tracking/standard_context_spec.rb b/spec/lib/gitlab/tracking/standard_context_spec.rb
index 7a0a4f0cc46..561edbd38f8 100644
--- a/spec/lib/gitlab/tracking/standard_context_spec.rb
+++ b/spec/lib/gitlab/tracking/standard_context_spec.rb
@@ -22,7 +22,7 @@ RSpec.describe Gitlab::Tracking::StandardContext do
 
       context 'staging' do
         before do
-          allow(Gitlab).to receive(:staging?).and_return(true)
+          stub_config_setting(url: 'https://staging.gitlab.com')
         end
 
         include_examples 'contains environment', 'staging'
@@ -30,11 +30,27 @@ RSpec.describe Gitlab::Tracking::StandardContext do
 
       context 'production' do
         before do
-          allow(Gitlab).to receive(:com_and_canary?).and_return(true)
+          stub_config_setting(url: 'https://gitlab.com')
         end
 
         include_examples 'contains environment', 'production'
       end
+
+      context 'org' do
+        before do
+          stub_config_setting(url: 'https://dev.gitlab.org')
+        end
+
+        include_examples 'contains environment', 'org'
+      end
+
+      context 'other self-managed instance' do
+        before do
+          stub_rails_env('production')
+        end
+
+        include_examples 'contains environment', 'self-managed'
+      end
     end
 
     it 'contains source' do