Merge branch 'web-url-in-presenters' into 'master'

Add web_url/web_path on Gitlab::View::Presenter::Base

See merge request gitlab-org/gitlab!30176

app/presenters/commit_presenter.rb

@@ -17,14 +17,6 @@ class CommitPresenter < Gitlab::View::Presenter::Delegated
     commit.pipelines.any?
   end
 
-  def web_url
-    url_builder.build(commit)
-  end
-
-  def web_path
-    url_builder.build(commit, only_path: true)
-  end
-
   def signature_html
     return unless commit.has_signature?
 

app/presenters/issue_presenter.rb

@@ -3,10 +3,6 @@
 class IssuePresenter < Gitlab::View::Presenter::Delegated
   presents :issue
 
-  def web_url
-    url_builder.build(issue)
-  end
-
   def issue_path
     url_builder.build(issue, only_path: true)
   end

app/presenters/merge_request_presenter.rb

@@ -202,10 +202,6 @@ class MergeRequestPresenter < Gitlab::View::Presenter::Delegated
     end
   end
 
-  def web_url
-    Gitlab::UrlBuilder.build(merge_request)
-  end
-
   def subscribed?
     merge_request.subscribed?(current_user, merge_request.target_project)
   end

app/presenters/snippet_presenter.rb

@@ -3,12 +3,8 @@
 class SnippetPresenter < Gitlab::View::Presenter::Delegated
   presents :snippet
 
-  def web_url
-    Gitlab::UrlBuilder.build(snippet)
-  end
-
   def raw_url
-    Gitlab::UrlBuilder.build(snippet, raw: true)
+    url_builder.build(snippet, raw: true)
   end
 
   def ssh_url_to_repo

app/presenters/user_presenter.rb

@@ -2,12 +2,4 @@
 
 class UserPresenter < Gitlab::View::Presenter::Delegated
   presents :user
-
-  def web_url
-    Gitlab::Routing.url_helpers.user_url(user)
-  end
-
-  def web_path
-    Gitlab::Routing.url_helpers.user_path(user)
-  end
 end

lib/gitlab/view/presenter/base.rb

@@ -34,6 +34,14 @@ module Gitlab
           super || subject.is_a?(type)
         end
 
+        def web_url
+          url_builder.build(subject)
+        end
+
+        def web_path
+          url_builder.build(subject, only_path: true)
+        end
+
         class_methods do
           def presenter?
             true

spec/lib/gitlab/view/presenter/base_spec.rb

@@ -57,4 +57,32 @@ RSpec.describe Gitlab::View::Presenter::Base do
       expect(presenter.present).to eq(presenter)
     end
   end
+
+  describe '#url_builder' do
+    it 'returns the UrlBuilder instance' do
+      presenter = presenter_class.new(project)
+
+      expect(presenter.url_builder).to eq(Gitlab::UrlBuilder.instance)
+    end
+  end
+
+  describe '#web_url' do
+    it 'delegates to the UrlBuilder' do
+      presenter = presenter_class.new(project)
+
+      expect(presenter.url_builder).to receive(:build).with(project)
+
+      presenter.web_url
+    end
+  end
+
+  describe '#web_path' do
+    it 'delegates to the UrlBuilder' do
+      presenter = presenter_class.new(project)
+
+      expect(presenter.url_builder).to receive(:build).with(project, only_path: true)
+
+      presenter.web_path
+    end
+  end
 end