Merge branch 'master' into chart.html.haml-refactorchart.html.haml-refactor

* master: (484 commits)
  migrate admin:users:* to static bundle
  correct for missing break statement in dispatcher.js
  alias create and update actions to new and edit
  migrate projects:merge_requests:edit to static bundle
  migrate projects:merge_requests:creations:diffs to static bundle
  migrate projects:merge_requests:creations:new to static bundle
  migrate projects:issues:new and projects:issues:edit to static bundle
  migrate projects:branches:index to static bundle
  migrate projects:branches:new to static bundle
  migrate projects:compare:show to static bundle
  migrate projects:environments:metrics to static bundle
  migrate projects:milestones:* and groups:milestones:* to static bundle
  migrate explore:groups:index to static bundle
  migrate explore:projects:* to static bundle
  migrate dashboard:projects:* to static bundle
  migrate admin:jobs:index to static bundle
  migrate dashboard:todos:index to static bundle
  migrate groups:merge_requests to static bundle
  migrate groups:issues to static bundle
  migrate dashboard:merge_requests to static bundle
  ...

1 files changed, 40 insertions, 3 deletions

diff --git a/spec/models/project_auto_devops_spec.rb b/spec/models/project_auto_devops_spec.rb
index 12069575866..296b91a771c 100644
--- a/spec/models/project_auto_devops_spec.rb
+++ b/spec/models/project_auto_devops_spec.rb
@@ -18,7 +18,21 @@ describe ProjectAutoDevops do
     context 'when domain is empty' do
       let(:auto_devops) { build_stubbed(:project_auto_devops, project: project, domain: '') }
 
-      it { expect(auto_devops).not_to have_domain }
+      context 'when there is an instance domain specified' do
+        before do
+          allow(Gitlab::CurrentSettings).to receive(:auto_devops_domain).and_return('example.com')
+        end
+
+        it { expect(auto_devops).to have_domain }
+      end
+
+      context 'when there is no instance domain specified' do
+        before do
+          allow(Gitlab::CurrentSettings).to receive(:auto_devops_domain).and_return(nil)
+        end
+
+        it { expect(auto_devops).not_to have_domain }
+      end
     end
   end
 
@@ -29,9 +43,32 @@ describe ProjectAutoDevops do
       let(:domain) { 'example.com' }
 
       it 'returns AUTO_DEVOPS_DOMAIN' do
-        expect(auto_devops.variables).to include(
-          { key: 'AUTO_DEVOPS_DOMAIN', value: 'example.com', public: true })
+        expect(auto_devops.variables).to include(domain_variable)
       end
     end
+
+    context 'when domain is not defined' do
+      let(:domain) { nil }
+
+      context 'when there is an instance domain specified' do
+        before do
+          allow(Gitlab::CurrentSettings).to receive(:auto_devops_domain).and_return('example.com')
+        end
+
+        it { expect(auto_devops.variables).to include(domain_variable) }
+      end
+
+      context 'when there is no instance domain specified' do
+        before do
+          allow(Gitlab::CurrentSettings).to receive(:auto_devops_domain).and_return(nil)
+        end
+
+        it { expect(auto_devops.variables).not_to include(domain_variable) }
+      end
+    end
+
+    def domain_variable
+      { key: 'AUTO_DEVOPS_DOMAIN', value: 'example.com', public: true }
+    end
   end
 end