Merge branch 'remove-routes-helper' into 'master'

Fix Slack notification URL and remove the usage of Ci::RoutesHelper

Fix for #2644

See merge request !1391

app/helpers/ci/routes_helper.rb

-module Ci
-  module RoutesHelper
-    class Base
-      include Gitlab::Application.routes.url_helpers
-
-      def default_url_options
-        {
-          host: Settings.gitlab['host'],
-          protocol: Settings.gitlab['https'] ? "https" : "http",
-          port: Settings.gitlab['port']
-        }
-      end
-    end
-
-    def url_helpers
-      @url_helpers ||= Base.new
-    end
-
-    def self.method_missing(method, *args, &block)
-      @url_helpers ||= Base.new
-
-      if @url_helpers.respond_to?(method)
-        @url_helpers.send(method, *args, &block)
-      else
-        super method, *args, &block
-      end
-    end
-  end
-end

app/models/project_services/ci/hip_chat_message.rb

 module Ci
   class HipChatMessage
+    include Gitlab::Application.routes.url_helpers
+
     attr_reader :build
 
     def initialize(build)
@@ -8,13 +10,13 @@ module Ci
 
     def to_s
       lines = Array.new
-      lines.push("<a href=\"#{Ci::RoutesHelper.ci_project_url(project)}\">#{project.name}</a> - ")
+      lines.push("<a href=\"#{ci_project_url(project)}\">#{project.name}</a> - ")
       
       if commit.matrix?
-        lines.push("<a href=\"#{Ci::RoutesHelper.ci_project_ref_commits_url(project, commit.ref, commit.sha)}\">Commit ##{commit.id}</a></br>")
+        lines.push("<a href=\"#{ci_project_ref_commits_url(project, commit.ref, commit.sha)}\">Commit ##{commit.id}</a></br>")
       else
         first_build = commit.builds_without_retry.first
-        lines.push("<a href=\"#{Ci::RoutesHelper.ci_project_build_url(project, first_build)}\">Build '#{first_build.name}' ##{first_build.id}</a></br>")
+        lines.push("<a href=\"#{ci_project_build_url(project, first_build)}\">Build '#{first_build.name}' ##{first_build.id}</a></br>")
       end
       
       lines.push("#{commit.short_sha} #{commit.git_author_name} - #{commit.git_commit_message}</br>")

app/models/project_services/ci/slack_message.rb

@@ -2,6 +2,8 @@ require 'slack-notifier'
 
 module Ci
   class SlackMessage
+    include Gitlab::Application.routes.url_helpers
+
     def initialize(commit)
       @commit = commit
     end
@@ -27,7 +29,7 @@ module Ci
           next unless build.failed?
           fields << {
             title: build.name,
-            value: "Build <#{Ci::RoutesHelper.ci_project_build_url(project, build)}|\##{build.id}> failed in #{build.duration.to_i} second(s)."
+            value: "Build <#{ci_project_build_url(project, build)}|\##{build.id}> failed in #{build.duration.to_i} second(s)."
           }
         end
       end
@@ -44,12 +46,12 @@ module Ci
     attr_reader :commit
 
     def attachment_message
-      out = "<#{Ci::RoutesHelper.ci_project_url(project)}|#{project_name}>: "
+      out = "<#{ci_project_url(project)}|#{project_name}>: "
       if commit.matrix?
-        out << "Commit <#{Ci::RoutesHelper.ci_project_ref_commits_url(project, commit.ref, commit.sha)}|\##{commit.id}> "
+        out << "Commit <#{ci_project_ref_commits_url(project, commit.ref, commit.sha)}|\##{commit.id}> "
       else
         build = commit.builds_without_retry.first
-        out << "Build <#{Ci::RoutesHelper.ci_project_build_path(project, build)}|\##{build.id}> "
+        out << "Build <#{ci_project_build_url(project, build)}|\##{build.id}> "
       end
       out << "(<#{commit_sha_link}|#{commit.short_sha}>) "
       out << "of <#{commit_ref_link}|#{commit.ref}> "

app/models/project_services/gitlab_ci_service.rb

@@ -19,6 +19,8 @@
 #
 
 class GitlabCiService < CiService
+  include Gitlab::Application.routes.url_helpers
+
   after_save :compose_service_hook, if: :activated?
 
   def compose_service_hook
@@ -92,7 +94,7 @@ class GitlabCiService < CiService
 
   def build_page(sha, ref)
     if project.gitlab_ci_project.present?
-      Ci::RoutesHelper.ci_project_ref_commits_path(project.gitlab_ci_project, ref, sha)
+      ci_project_ref_commits_url(project.gitlab_ci_project, ref, sha)
     end
   end
 

spec/models/project_services/gitlab_ci_service_spec.rb

@@ -39,8 +39,8 @@ describe GitlabCiService do
     end
 
     describe :build_page do
-      it { expect(@service.build_page("2ab7834c", 'master')).to eq("/ci/projects/#{@ci_project.id}/refs/master/commits/2ab7834c")}
-      it { expect(@service.build_page("issue#2", 'master')).to eq("/ci/projects/#{@ci_project.id}/refs/master/commits/issue%232")}
+      it { expect(@service.build_page("2ab7834c", 'master')).to eq("http://localhost/ci/projects/#{@ci_project.id}/refs/master/commits/2ab7834c")}
+      it { expect(@service.build_page("issue#2", 'master')).to eq("http://localhost/ci/projects/#{@ci_project.id}/refs/master/commits/issue%232")}
     end
 
     describe "execute" do