Introduce ci_environment_url which would fallback

to the external_url from persisted environment,
and make the other utility methods private as
we don't really need to use them outside of the job.

1 files changed, 18 insertions, 6 deletions

diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb
index 141a2741ced..0c68ac20c7d 100644
--- a/spec/models/ci/build_spec.rb
+++ b/spec/models/ci/build_spec.rb
@@ -427,11 +427,11 @@ describe Ci::Build, :models do
       end
     end
 
-    describe '#expanded_environment_url' do
-      subject { build.expanded_environment_url }
+    describe '#ci_environment_url' do
+      subject { job.ci_environment_url }
 
-      context 'when environment uses $CI_COMMIT_REF_NAME' do
-        let(:build) do
+      context 'when yaml environment uses $CI_COMMIT_REF_NAME' do
+        let(:job) do
           create(:ci_build,
                  ref: 'master',
                  options: { environment: { url: 'http://review/$CI_COMMIT_REF_NAME' } })
@@ -440,8 +440,8 @@ describe Ci::Build, :models do
         it { is_expected.to eq('http://review/master') }
       end
 
-      context 'when environment uses yaml_variables containing symbol keys' do
-        let(:build) do
+      context 'when yaml environment uses yaml_variables containing symbol keys' do
+        let(:job) do
           create(:ci_build,
                  yaml_variables: [{ key: :APP_HOST, value: 'host' }],
                  options: { environment: { url: 'http://review/$APP_HOST' } })
@@ -449,6 +449,18 @@ describe Ci::Build, :models do
 
         it { is_expected.to eq('http://review/host') }
       end
+
+      context 'when yaml environment does not have url' do
+        let(:job) { create(:ci_build, environment: 'staging') }
+
+        let!(:environment) do
+          create(:environment, project: job.project, name: job.environment)
+        end
+
+        it 'returns the external_url from persisted environment' do
+          is_expected.to eq(environment.external_url)
+        end
+      end
     end
 
     describe '#starts_environment?' do