Merge branch 'route-map' into 'master'

Add 'View on [env]' link to blobs and individual files in diffs

See merge request !8867

2 files changed, 106 insertions, 0 deletions

diff --git a/spec/lib/gitlab/database_spec.rb b/spec/lib/gitlab/database_spec.rb
index 3031559c613..b142b3a2781 100644
--- a/spec/lib/gitlab/database_spec.rb
+++ b/spec/lib/gitlab/database_spec.rb
@@ -55,6 +55,22 @@ describe Gitlab::Database, lib: true do
     end
   end
 
+  describe '.nulls_first_order' do
+    context 'when using PostgreSQL' do
+      before { expect(described_class).to receive(:postgresql?).and_return(true) }
+
+      it { expect(described_class.nulls_first_order('column', 'ASC')).to eq 'column ASC NULLS FIRST'}
+      it { expect(described_class.nulls_first_order('column', 'DESC')).to eq 'column DESC NULLS FIRST'}
+    end
+
+    context 'when using MySQL' do
+      before { expect(described_class).to receive(:postgresql?).and_return(false) }
+
+      it { expect(described_class.nulls_first_order('column', 'ASC')).to eq 'column ASC'}
+      it { expect(described_class.nulls_first_order('column', 'DESC')).to eq 'column IS NULL, column DESC'}
+    end
+  end
+
   describe '#true_value' do
     it 'returns correct value for PostgreSQL' do
       expect(described_class).to receive(:postgresql?).and_return(true)
diff --git a/spec/lib/gitlab/route_map_spec.rb b/spec/lib/gitlab/route_map_spec.rb
new file mode 100644
index 00000000000..459fa8a63a9
--- /dev/null
+++ b/spec/lib/gitlab/route_map_spec.rb
@@ -0,0 +1,90 @@
+require 'spec_helper'
+
+describe Gitlab::RouteMap, lib: true do
+  describe '#initialize' do
+    context 'when the data is not YAML' do
+      it 'raises an error' do
+        expect { described_class.new('"') }.
+          to raise_error(Gitlab::RouteMap::FormatError, /valid YAML/)
+      end
+    end
+
+    context 'when the data is not a YAML array' do
+      it 'raises an error' do
+        expect { described_class.new(YAML.dump('foo')) }.
+          to raise_error(Gitlab::RouteMap::FormatError, /an array/)
+      end
+    end
+
+    context 'when an entry is not a hash' do
+      it 'raises an error' do
+        expect { described_class.new(YAML.dump(['foo'])) }.
+          to raise_error(Gitlab::RouteMap::FormatError, /a hash/)
+      end
+    end
+
+    context 'when an entry does not have a source key' do
+      it 'raises an error' do
+        expect { described_class.new(YAML.dump([{ 'public' => 'index.html' }])) }.
+          to raise_error(Gitlab::RouteMap::FormatError, /source key/)
+      end
+    end
+
+    context 'when an entry does not have a public key' do
+      it 'raises an error' do
+        expect { described_class.new(YAML.dump([{ 'source' => '/index\.html/' }])) }.
+          to raise_error(Gitlab::RouteMap::FormatError, /public key/)
+      end
+    end
+
+    context 'when an entry source does not start and end with a slash' do
+      it 'raises an error' do
+        expect { described_class.new(YAML.dump([{ 'source' => 'index.html', 'public' => 'index.html' }])) }.
+          to raise_error(Gitlab::RouteMap::FormatError, /a slash/)
+      end
+    end
+
+    context 'when an entry source is not a valid regex' do
+      it 'raises an error' do
+        expect { described_class.new(YAML.dump([{ 'source' => '/[/', 'public' => 'index.html' }])) }.
+          to raise_error(Gitlab::RouteMap::FormatError, /regular expression/)
+      end
+    end
+
+    context 'when all is good' do
+      it 'returns a route map' do
+        route_map = described_class.new(YAML.dump([{ 'source' => '/index\.html/', 'public' => 'index.html' }]))
+        
+        expect(route_map.public_path_for_source_path('index.html')).to eq('index.html')
+      end
+    end
+  end
+
+  describe '#public_path_for_source_path' do
+    subject do
+      described_class.new(<<-'MAP'.strip_heredoc)
+        # Blogposts
+        - source: /source/posts/([0-9]{4})-([0-9]{2})-([0-9]{2})-(.+?)\..*/ # source/posts/2017-01-30-around-the-world-in-6-releases.html.md.erb
+          public: '\1/\2/\3/\4/' # 2017/01/30/around-the-world-in-6-releases/
+
+        # HTML files
+        - source: /source/(.+?\.html).*/ # source/index.html.haml
+          public: '\1' # index.html
+
+        # Other files
+        - source: /source/(.*)/ # source/images/blogimages/around-the-world-in-6-releases-cover.png
+          public: '\1' # images/blogimages/around-the-world-in-6-releases-cover.png
+      MAP
+    end
+
+    it 'returns the public path for a provided source path' do
+      expect(subject.public_path_for_source_path('source/posts/2017-01-30-around-the-world-in-6-releases.html.md.erb')).to eq('2017/01/30/around-the-world-in-6-releases/')
+
+      expect(subject.public_path_for_source_path('source/index.html.haml')).to eq('index.html')
+
+      expect(subject.public_path_for_source_path('source/images/blogimages/around-the-world-in-6-releases-cover.png')).to eq('images/blogimages/around-the-world-in-6-releases-cover.png')
+
+      expect(subject.public_path_for_source_path('.gitlab/route-map.yml')).to be_nil
+    end
+  end
+end