Add latest changes from gitlab-org/gitlab@master

1 files changed, 7 insertions, 1 deletions

diff --git a/spec/lib/gitlab/asset_proxy_spec.rb b/spec/lib/gitlab/asset_proxy_spec.rb
index f5aa1819982..e406917a5a4 100644
--- a/spec/lib/gitlab/asset_proxy_spec.rb
+++ b/spec/lib/gitlab/asset_proxy_spec.rb
@@ -33,9 +33,15 @@ describe Gitlab::AssetProxy do
       expect(described_class.proxy_url(url)).to eq(proxied_url)
     end
 
+    it 'returns original URL for invalid domains' do
+      url = 'foo_bar://'
+
+      expect(described_class.proxy_url(url)).to eq(url)
+    end
+
     context 'whitelisted domain' do
       it 'returns original URL for single domain whitelist' do
-        url = 'http://gitlab.com/test.png'
+        url = 'http://gitlab.com/${default_branch}/test.png'
 
         expect(described_class.proxy_url(url)).to eq(url)
       end