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
Boxiang Sun
gitlab-ce
Commits
1607efa4
Commit
1607efa4
authored
Nov 17, 2016
by
Z.J. van de Weg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add tests for increased converage
parent
6737ada0
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
45 additions
and
37 deletions
+45
-37
lib/gitlab/chat_commands/base_command.rb
lib/gitlab/chat_commands/base_command.rb
+0
-8
lib/gitlab/chat_commands/command.rb
lib/gitlab/chat_commands/command.rb
+13
-3
lib/gitlab/chat_commands/issue_create.rb
lib/gitlab/chat_commands/issue_create.rb
+3
-3
lib/gitlab/chat_commands/issue_show.rb
lib/gitlab/chat_commands/issue_show.rb
+1
-1
lib/mattermost/presenter.rb
lib/mattermost/presenter.rb
+3
-2
spec/lib/gitlab/chat_commands/command_spec.rb
spec/lib/gitlab/chat_commands/command_spec.rb
+17
-5
spec/lib/gitlab/chat_commands/issue_create_spec.rb
spec/lib/gitlab/chat_commands/issue_create_spec.rb
+5
-10
spec/lib/gitlab/chat_commands/issue_show_spec.rb
spec/lib/gitlab/chat_commands/issue_show_spec.rb
+3
-5
No files found.
lib/gitlab/chat_commands/base_command.rb
View file @
1607efa4
...
@@ -35,14 +35,6 @@ module Gitlab
...
@@ -35,14 +35,6 @@ module Gitlab
Ability
.
allowed?
(
object
,
action
,
subject
)
Ability
.
allowed?
(
object
,
action
,
subject
)
end
end
def
present
(
resource
)
Mattermost
::
Presenter
.
present
(
resource
)
end
def
help
(
messages
)
Mattermost
::
Presenter
.
help
(
messages
)
end
def
find_by_iid
(
iid
)
def
find_by_iid
(
iid
)
resource
=
collection
.
find_by
(
iid:
iid
)
resource
=
collection
.
find_by
(
iid:
iid
)
...
...
lib/gitlab/chat_commands/command.rb
View file @
1607efa4
...
@@ -9,9 +9,11 @@ module Gitlab
...
@@ -9,9 +9,11 @@ module Gitlab
def
execute
def
execute
klass
,
match
=
fetch_klass
klass
,
match
=
fetch_klass
return
help
(
help_messages
,
params
[
:command
])
unless
klass
.
try
(
:available?
,
project
)
if
klass
present
klass
.
new
(
project
,
current_user
,
params
).
execute
(
match
)
klass
.
new
(
project
,
current_user
,
params
).
execute
(
match
)
else
help
(
help_messages
)
end
end
end
private
private
...
@@ -40,6 +42,14 @@ module Gitlab
...
@@ -40,6 +42,14 @@ module Gitlab
def
command
def
command
params
[
:text
]
params
[
:text
]
end
end
def
present
(
resource
)
Mattermost
::
Presenter
.
present
(
resource
)
end
def
help
(
messages
)
Mattermost
::
Presenter
.
help
(
messages
,
params
[
:command
])
end
end
end
end
end
end
end
lib/gitlab/chat_commands/issue_create.rb
View file @
1607efa4
...
@@ -10,12 +10,12 @@ module Gitlab
...
@@ -10,12 +10,12 @@ module Gitlab
end
end
def
execute
(
match
)
def
execute
(
match
)
present
nil
unless
can?
(
current_user
,
:create_issue
,
project
)
return
nil
unless
can?
(
current_user
,
:create_issue
,
project
)
title
=
match
[
:title
]
title
=
match
[
:title
]
description
=
match
[
:description
]
description
=
match
[
:description
]
present
Issues
::
CreateService
.
new
(
project
,
current_user
,
title:
title
,
description:
description
).
execute
Issues
::
CreateService
.
new
(
project
,
current_user
,
title:
title
,
description:
description
).
execute
end
end
end
end
end
end
...
...
lib/gitlab/chat_commands/issue_show.rb
View file @
1607efa4
...
@@ -10,7 +10,7 @@ module Gitlab
...
@@ -10,7 +10,7 @@ module Gitlab
end
end
def
execute
(
match
)
def
execute
(
match
)
present
find_by_iid
(
match
[
:iid
])
find_by_iid
(
match
[
:iid
])
end
end
end
end
end
end
...
...
lib/mattermost/presenter.rb
View file @
1607efa4
...
@@ -4,19 +4,20 @@ module Mattermost
...
@@ -4,19 +4,20 @@ module Mattermost
include
Rails
.
application
.
routes
.
url_helpers
include
Rails
.
application
.
routes
.
url_helpers
def
authorize_chat_name
(
url
)
def
authorize_chat_name
(
url
)
message
=
"Hi there! We've yet to get acquainted! Please
[introduce yourself
](
#{
url
}
)!"
message
=
"Hi there! We've yet to get acquainted! Please
introduce yourself by [connection your GitLab profile
](
#{
url
}
)!"
ephemeral_response
(
message
)
ephemeral_response
(
message
)
end
end
def
help
(
messages
,
command
)
def
help
(
messages
,
command
)
return
ephemeral_response
(
"No commands configured"
)
unless
messages
.
count
>
1
message
=
[
"Available commands:"
]
message
=
[
"Available commands:"
]
messages
.
each
do
|
messsage
|
messages
.
each
do
|
messsage
|
message
<<
"-
#{
command
}
#{
message
}
"
message
<<
"-
#{
command
}
#{
message
}
"
end
end
ephemeral_response
(
message
s
.
join
(
"
\n
"
))
ephemeral_response
(
message
.
join
(
"
\n
"
))
end
end
def
not_found
def
not_found
...
...
spec/lib/gitlab/chat_commands/command_spec.rb
View file @
1607efa4
...
@@ -3,17 +3,17 @@ require 'spec_helper'
...
@@ -3,17 +3,17 @@ require 'spec_helper'
describe
Gitlab
::
ChatCommands
::
Command
,
service:
true
do
describe
Gitlab
::
ChatCommands
::
Command
,
service:
true
do
let
(
:project
)
{
create
(
:project
)
}
let
(
:project
)
{
create
(
:project
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:params
)
{
{
text:
'issue show 1'
}
}
subject
{
described_class
.
new
(
project
,
user
,
params
).
execute
}
subject
{
described_class
.
new
(
project
,
user
,
params
).
execute
}
describe
'#execute'
do
describe
'#execute'
do
context
'when the command is not available'
do
context
'when no command is not available'
do
let
(
:params
)
{
{
text:
'issue show 1'
}
}
let
(
:project
)
{
create
(
:project
,
has_external_issue_tracker:
true
)
}
let
(
:project
)
{
create
(
:project
,
has_external_issue_tracker:
true
)
}
it
'displays the help message'
do
it
'displays the help message'
do
expect
(
subject
[
:response_type
]).
to
be
(
:ephemeral
)
expect
(
subject
[
:response_type
]).
to
be
(
:ephemeral
)
expect
(
subject
[
:text
]).
to
start_with
(
'
Available commands
'
)
expect
(
subject
[
:text
]).
to
start_with
(
'
404 not found
'
)
end
end
end
end
...
@@ -25,5 +25,17 @@ describe Gitlab::ChatCommands::Command, service: true do
...
@@ -25,5 +25,17 @@ describe Gitlab::ChatCommands::Command, service: true do
expect
(
subject
[
:text
]).
to
start_with
(
'Available commands'
)
expect
(
subject
[
:text
]).
to
start_with
(
'Available commands'
)
end
end
end
end
context
'issue is succesfully created'
do
let
(
:params
)
{
{
text:
"issue create my new issue"
}
}
before
do
project
.
team
<<
[
user
,
:master
]
end
it
'presents the issue'
do
expect
(
subject
[
:text
]).
to
match
(
"my new issue"
)
end
end
end
end
end
end
spec/lib/gitlab/chat_commands/issue_create_spec.rb
View file @
1607efa4
...
@@ -16,12 +16,9 @@ describe Gitlab::ChatCommands::IssueCreate, service: true do
...
@@ -16,12 +16,9 @@ describe Gitlab::ChatCommands::IssueCreate, service: true do
context
'without description'
do
context
'without description'
do
it
'creates the issue'
do
it
'creates the issue'
do
expect
do
expect
{
subject
}.
to
change
{
project
.
issues
.
count
}.
by
(
1
)
subject
# this trigger the execution
end
.
to
change
{
project
.
issues
.
count
}.
by
(
1
)
expect
(
subject
[
:response_type
]).
to
be
:in_channel
expect
(
subject
.
title
).
to
eq
(
'bird is the word'
)
expect
(
subject
[
:text
]).
to
match
(
'bird is the word'
)
end
end
end
end
...
@@ -29,11 +26,9 @@ describe Gitlab::ChatCommands::IssueCreate, service: true do
...
@@ -29,11 +26,9 @@ describe Gitlab::ChatCommands::IssueCreate, service: true do
let
(
:description
)
{
"Surfin bird"
}
let
(
:description
)
{
"Surfin bird"
}
let
(
:regex_match
)
{
described_class
.
match
(
"issue create bird is the word
\n
#{
description
}
"
)
}
let
(
:regex_match
)
{
described_class
.
match
(
"issue create bird is the word
\n
#{
description
}
"
)
}
before
do
it
'creates the issue with description'
do
subject
subject
end
it
'creates the issue with description'
do
expect
(
Issue
.
last
.
description
).
to
eq
(
description
)
expect
(
Issue
.
last
.
description
).
to
eq
(
description
)
end
end
end
end
...
...
spec/lib/gitlab/chat_commands/issue_show_spec.rb
View file @
1607efa4
...
@@ -17,17 +17,15 @@ describe Gitlab::ChatCommands::IssueShow, service: true do
...
@@ -17,17 +17,15 @@ describe Gitlab::ChatCommands::IssueShow, service: true do
context
'the issue exists'
do
context
'the issue exists'
do
it
'returns the issue'
do
it
'returns the issue'
do
expect
(
subject
[
:response_type
]).
to
be
(
:in_channel
)
expect
(
subject
.
iid
).
to
be
issue
.
iid
expect
(
subject
[
:text
]).
to
match
(
issue
.
title
)
end
end
end
end
context
'the issue does not exist'
do
context
'the issue does not exist'
do
let
(
:regex_match
)
{
described_class
.
match
(
"issue show
1234
"
)
}
let
(
:regex_match
)
{
described_class
.
match
(
"issue show
2343242
"
)
}
it
"returns nil"
do
it
"returns nil"
do
expect
(
subject
[
:response_type
]).
to
be
(
:ephemeral
)
expect
(
subject
).
to
be_nil
expect
(
subject
[
:text
]).
to
start_with
(
'404 not found!'
)
end
end
end
end
end
end
...
...
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