Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
8d8b8212
Commit
8d8b8212
authored
Mar 14, 2012
by
Ariejan de Vroom
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Count +1 votes in issue notes.
parent
ed11ca13
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
81 additions
and
15 deletions
+81
-15
app/models/issue.rb
app/models/issue.rb
+5
-0
app/models/note.rb
app/models/note.rb
+15
-9
app/views/issues/_show.html.haml
app/views/issues/_show.html.haml
+2
-0
app/views/issues/show.html.haml
app/views/issues/show.html.haml
+3
-0
spec/models/issue_spec.rb
spec/models/issue_spec.rb
+31
-0
spec/models/note_spec.rb
spec/models/note_spec.rb
+25
-6
No files found.
app/models/issue.rb
View file @
8d8b8212
...
@@ -45,6 +45,11 @@ class Issue < ActiveRecord::Base
...
@@ -45,6 +45,11 @@ class Issue < ActiveRecord::Base
def
new?
def
new?
today?
&&
created_at
==
updated_at
today?
&&
created_at
==
updated_at
end
end
# Return the number of +1 comments (upvotes)
def
upvotes
notes
.
select
(
&
:upvote?
).
size
end
end
end
# == Schema Information
# == Schema Information
#
#
...
...
app/models/note.rb
View file @
8d8b8212
...
@@ -87,6 +87,12 @@ class Note < ActiveRecord::Base
...
@@ -87,6 +87,12 @@ class Note < ActiveRecord::Base
rescue
rescue
nil
nil
end
end
# Returns true if this is an upvote note,
# otherwise false is returned
def
upvote?
note
=~
/^\+1/
?
true
:
false
end
end
end
# == Schema Information
# == Schema Information
#
#
...
...
app/views/issues/_show.html.haml
View file @
8d8b8212
...
@@ -14,6 +14,8 @@
...
@@ -14,6 +14,8 @@
%span
.label.important
critical
%span
.label.important
critical
-
if
issue
.
today?
-
if
issue
.
today?
%span
.label.success
today
%span
.label.success
today
-
if
issue
.
upvotes
>
0
%span
.label.success
=
"+
#{
issue
.
upvotes
}
"
...
...
app/views/issues/show.html.haml
View file @
8d8b8212
...
@@ -36,6 +36,9 @@
...
@@ -36,6 +36,9 @@
=
image_tag
gravatar_icon
(
@issue
.
assignee_email
),
:width
=>
16
,
:class
=>
"lil_av"
=
image_tag
gravatar_icon
(
@issue
.
assignee_email
),
:width
=>
16
,
:class
=>
"lil_av"
%strong
.author
=
link_to_issue_assignee
(
@issue
)
%strong
.author
=
link_to_issue_assignee
(
@issue
)
-
if
@issue
.
upvotes
>
0
%span
.label.success
=
"+
#{
@issue
.
upvotes
}
"
%hr
%hr
%div
=
simple_format
@issue
.
title
%div
=
simple_format
@issue
.
title
...
...
spec/models/issue_spec.rb
View file @
8d8b8212
...
@@ -24,6 +24,37 @@ describe Issue do
...
@@ -24,6 +24,37 @@ describe Issue do
:assignee
=>
Factory
(
:user
),
:assignee
=>
Factory
(
:user
),
:project
=>
Factory
.
create
(
:project
)).
should
be_valid
}
:project
=>
Factory
.
create
(
:project
)).
should
be_valid
}
describe
"plus 1"
do
let
(
:project
)
{
Factory
(
:project
)
}
subject
{
Factory
.
create
(
:issue
,
:author
=>
Factory
(
:user
),
:assignee
=>
Factory
(
:user
),
:project
=>
project
)
}
it
"with no notes has a 0/0 score"
do
subject
.
upvotes
.
should
==
0
end
it
"should recognize non-+1 notes"
do
subject
.
notes
<<
Factory
(
:note
,
note:
"No +1 here"
,
project:
Factory
(
:project
,
path:
'plusone'
,
code:
'plusone'
))
subject
.
should
have
(
1
).
note
subject
.
notes
.
first
.
upvote?
.
should
be_false
subject
.
upvotes
.
should
==
0
end
it
"should recognize a single +1 note"
do
subject
.
notes
<<
Factory
(
:note
,
note:
"+1 This is awesome"
,
project:
Factory
(
:project
,
path:
'plusone'
,
code:
'plusone'
))
subject
.
upvotes
.
should
==
1
end
it
"should recognize a multiple +1 notes"
do
subject
.
notes
<<
Factory
(
:note
,
note:
"+1 This is awesome"
,
project:
Factory
(
:project
,
path:
'plusone'
,
code:
'plusone'
))
subject
.
notes
<<
Factory
(
:note
,
note:
"+1 I want this"
,
project:
Factory
(
:project
,
path:
'plustwo'
,
code:
'plustwo'
))
subject
.
upvotes
.
should
==
2
end
end
end
end
# == Schema Information
# == Schema Information
#
#
...
...
spec/models/note_spec.rb
View file @
8d8b8212
...
@@ -21,6 +21,25 @@ describe Note do
...
@@ -21,6 +21,25 @@ describe Note do
end
end
end
end
describe
"Voting score"
do
let
(
:project
)
{
Factory
(
:project
)
}
it
"recognizes a neutral note"
do
note
=
Factory
(
:note
,
project:
project
,
note:
"This is not a +1 note"
)
note
.
should_not
be_upvote
end
it
"recognizes a +1 note"
do
note
=
Factory
(
:note
,
project:
project
,
note:
"+1 for this"
)
note
.
should
be_upvote
end
it
"recognizes a -1 note as no vote"
do
note
=
Factory
(
:note
,
project:
project
,
note:
"-1 for this"
)
note
.
should_not
be_upvote
end
end
describe
"Commit notes"
do
describe
"Commit notes"
do
before
do
before
do
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment