summaryrefslogtreecommitdiff
path: root/app/helpers
diff options
context:
space:
mode:
authorZ.J. van de Weg <zegerjan@gitlab.com>2016-09-07 14:48:43 +0200
committerFatih Acet <acetfatih@gmail.com>2016-09-19 19:53:09 +0300
commite8dd0d54cb1e82d142978224a4e062a705cae2cf (patch)
treefada10ed9931976930db159f0c385d186a718f6d /app/helpers
parent412ff80b7b1381485a306df240aab020e9b90801 (diff)
downloadgitlab-ce-e8dd0d54cb1e82d142978224a4e062a705cae2cf.tar.gz
Fix tests for Snippets toggling awards
Also incorporate feedback
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/award_emoji_helper.rb10
-rw-r--r--app/helpers/gitlab_routing_helper.rb8
2 files changed, 11 insertions, 7 deletions
diff --git a/app/helpers/award_emoji_helper.rb b/app/helpers/award_emoji_helper.rb
index c358abc52ea..aa134cea31c 100644
--- a/app/helpers/award_emoji_helper.rb
+++ b/app/helpers/award_emoji_helper.rb
@@ -1,13 +1,9 @@
module AwardEmojiHelper
def toggle_award_url(awardable)
- unless awardable.is_a?(Snippet)
- return url_for([:toggle_award_emoji, @project.namespace.becomes(Namespace), @project, awardable])
- end
-
- if awardable.is_a?(ProjectSnippet)
- toggle_award_emoji_namespace_project_snippet_path(@project.namespace.becomes(Namespace), @project, awardable)
+ if @project
+ url_for([:toggle_award_emoji, @project.namespace.becomes(Namespace), @project, awardable])
else
- toggle_award_emoji_snippet_url(awardable)
+ url_for([:toggle_award_emoji, awardable])
end
end
end
diff --git a/app/helpers/gitlab_routing_helper.rb b/app/helpers/gitlab_routing_helper.rb
index a322a90cc4e..6277c138479 100644
--- a/app/helpers/gitlab_routing_helper.rb
+++ b/app/helpers/gitlab_routing_helper.rb
@@ -98,6 +98,14 @@ module GitlabRoutingHelper
end
end
+ def toggle_award_emoji_personal_snippet_path(*args)
+ toggle_award_emoji_snippet_path(*args)
+ end
+
+ def toggle_award_emoji_namespace_project_project_snippet_path(*args)
+ toggle_award_emoji_namespace_project_snippet_path(*args)
+ end
+
## Members
def project_members_url(project, *args)
namespace_project_project_members_url(project.namespace, project)