Improve style, add more tests

4 files changed, 12 insertions, 19 deletions

diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index d6526ec4fdc..2c593dbb4ea 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -85,20 +85,11 @@ module API
       end
     end
 
-    def project_service
-      @project_service ||= user_project.find_or_initialize_service(params[:service_slug].underscore)
+    def project_service(project = user_project)
+      @project_service ||= project.find_or_initialize_service(params[:service_slug].underscore)
       @project_service || not_found!("Service")
     end
 
-    def service_by_slug(project, slug)
-      underscored_service = slug.underscore
-
-      not_found!('Service') unless Service.available_services_names.include?(underscored_service)
-      service_method = "#{underscored_service}_service"
-
-      service = project.public_send(service_method)
-    end
-
     def service_attributes
       @service_attributes ||= project_service.fields.inject([]) do |arr, hash|
         arr << hash[:name].to_sym
diff --git a/lib/api/services.rb b/lib/api/services.rb
index 163187d450d..e3c6a998631 100644
--- a/lib/api/services.rb
+++ b/lib/api/services.rb
@@ -67,7 +67,9 @@ module API
       post ':id/services/:service_slug/trigger' do
         project = Project.find_with_namespace(params[:id]) || Project.find_by(id: params[:id])
 
-        service = service_by_slug(project, params[:service_slug])
+        not_found! unless project
+
+        service = project_service(project)
 
         result = service.try(:active?) && service.try(:trigger, params)
 
@@ -75,7 +77,7 @@ module API
           status result[:status] || 200
           present result
         else
-          not_found!('Service')
+          not_found!
         end
       end
     end
diff --git a/lib/gitlab/chat_commands/base_command.rb b/lib/gitlab/chat_commands/base_command.rb
index f84aca5365d..e59d69b72b9 100644
--- a/lib/gitlab/chat_commands/base_command.rb
+++ b/lib/gitlab/chat_commands/base_command.rb
@@ -3,7 +3,7 @@ module Gitlab
     class BaseCommand
       QUERY_LIMIT = 5
 
-      def self.match(_)
+      def self.match(_text)
         raise NotImplementedError
       end
 
@@ -11,11 +11,11 @@ module Gitlab
         raise NotImplementedError
       end
 
-      def self.available?(_)
+      def self.available?(_project)
         raise NotImplementedError
       end
 
-      def self.allowed?(_, _)
+      def self.allowed?(_user, _ability)
         true
       end
 
diff --git a/lib/mattermost/presenter.rb b/lib/mattermost/presenter.rb
index d7455d39bce..b4e7358770f 100644
--- a/lib/mattermost/presenter.rb
+++ b/lib/mattermost/presenter.rb
@@ -1,7 +1,7 @@
 module Mattermost
   class Presenter
     class << self
-      include Rails.application.routes.url_helpers
+      include Gitlab::Routing.url_helpers
 
       def authorize_chat_name(url)
         message = if url
@@ -14,7 +14,7 @@ module Mattermost
       end
 
       def help(commands, trigger)
-        if commands.count == 0
+        if commands.empty?
           ephemeral_response("No commands configured") unless messages.count > 1
         else
           message = header_with_list("Available commands", commands)
@@ -50,7 +50,7 @@ module Mattermost
       end
 
       def single_resource(resource)
-        return error(resource) if resource.errors.any?
+        return error(resource) if resource.errors.any? || !resource.persisted?
 
         message = "### #{title(resource)}"
         message << "\n\n#{resource.description}" if resource.description