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
4a03fae9
Commit
4a03fae9
authored
Dec 20, 2016
by
Z.J. van de Weg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix rspec tests due to different API
[ci skip]
parent
0bd8669f
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
33 additions
and
36 deletions
+33
-36
lib/mattermost/session.rb
lib/mattermost/session.rb
+2
-2
spec/features/projects/services/mattermost_slash_command_spec.rb
...atures/projects/services/mattermost_slash_command_spec.rb
+4
-8
spec/lib/mattermost/command_spec.rb
spec/lib/mattermost/command_spec.rb
+10
-5
spec/lib/mattermost/team_spec.rb
spec/lib/mattermost/team_spec.rb
+5
-12
spec/models/project_services/mattermost_slash_commands_service_spec.rb
...roject_services/mattermost_slash_commands_service_spec.rb
+12
-9
No files found.
lib/mattermost/session.rb
View file @
4a03fae9
...
...
@@ -75,9 +75,9 @@ module Mattermost
def
get
(
path
,
options
=
{})
self
.
class
.
get
(
path
,
options
.
merge
(
headers:
@headers
))
rescue
HTTParty
::
Error
=>
e
raise
ConnectionError
(
e
.
message
)
raise
Mattermost
::
ConnectionError
.
new
(
e
.
message
)
rescue
Errno
::
ECONNREFUSED
=>
e
raise
ConnectionError
(
e
.
message
)
raise
Mattermost
::
ConnectionError
.
new
(
e
.
message
)
end
def
post
(
path
,
options
=
{})
...
...
spec/features/projects/services/mattermost_slash_command_spec.rb
View file @
4a03fae9
...
...
@@ -4,10 +4,12 @@ feature 'Setup Mattermost slash commands', feature: true do
include
WaitForAjax
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:project
)
}
let
(
:project
)
{
create
(
:
empty_
project
)
}
let
(
:service
)
{
project
.
create_mattermost_slash_commands_service
}
let
(
:mattermost_enabled
)
{
true
}
before
do
Settings
.
mattermost
[
'enabled'
]
=
mattermost_enabled
project
.
team
<<
[
user
,
:master
]
login_as
(
user
)
visit
edit_namespace_project_service_path
(
project
.
namespace
,
project
,
service
)
...
...
@@ -32,19 +34,13 @@ feature 'Setup Mattermost slash commands', feature: true do
end
describe
'mattermost service is enabled'
do
before
do
allow
(
Gitlab
.
config
.
mattermost
).
to
receive
(
:enabled
).
and_return
(
true
)
end
it
'shows the add to mattermost button'
do
expect
(
page
).
to
have_link
'Add to Mattermost'
end
end
describe
'mattermost service is not enabled'
do
before
do
allow
(
Gitlab
.
config
.
mattermost
).
to
receive
(
:enabled
).
and_return
(
false
)
end
let
(
:mattermost_enabled
)
{
false
}
it
'shows the correct trigger url'
do
value
=
find_field
(
'request_url'
).
value
...
...
spec/lib/mattermost/command_spec.rb
View file @
4a03fae9
require
'spec_helper'
describe
Mattermost
::
Command
do
let
(
:
hash
)
{
{
'token'
=>
'token
'
}
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:
params
)
{
{
'token'
=>
'token'
,
team_id:
'abc
'
}
}
let
(
:user
)
{
build
(
:user
)
}
before
do
Mattermost
::
Session
.
base_uri
(
"http://mattermost.example.com"
)
end
subject
{
described_class
.
new
(
user
)
}
describe
'#create'
do
it
'creates a command'
do
described_class
.
new
(
user
).
create
(
team_id:
'abc'
,
url:
'http://trigger.com'
)
it
'interpolates the team id'
do
allow
(
subject
).
to
receive
(
:json_post
).
with
(
'/api/v3/teams/abc/commands/create'
,
body:
params
.
to_json
).
and_return
(
'token'
=>
'token'
)
subject
.
create
(
params
)
end
end
end
spec/lib/mattermost/team_spec.rb
View file @
4a03fae9
...
...
@@ -2,7 +2,9 @@ require 'spec_helper'
describe
Mattermost
::
Team
do
describe
'#all'
do
let
(
:session
)
{
double
(
"session"
)
}
let
(
:user
)
{
build
(
:user
)
}
subject
{
described_class
.
new
(
user
)
}
let
(
:response
)
do
[{
...
...
@@ -20,22 +22,13 @@ describe Mattermost::Team do
"allow_open_invite"
=>
false
}]
end
let
(
:json
)
{
nil
}
before
do
allow
(
session
).
to
receive
(
:get
).
with
(
'/api/v3/teams/all'
).
and_return
(
json
)
allow
(
json
).
to
receive
(
:parsed_response
).
and_return
(
response
)
allow
(
subject
).
to
receive
(
:json_get
).
and_return
(
response
)
end
it
'gets the teams'
do
expect
(
described_class
.
all
(
session
).
count
).
to
be
(
1
)
end
it
'filters on being team admin'
do
ids
=
described_class
.
all
(
session
).
map
{
|
team
|
team
[
'id'
]
}
expect
(
ids
).
to
include
(
"xiyro8huptfhdndadpz8r3wnbo"
)
expect
(
subject
.
all
.
count
).
to
be
(
1
)
end
end
end
spec/models/project_services/mattermost_slash_commands_service_spec.rb
View file @
4a03fae9
...
...
@@ -3,23 +3,23 @@ require 'spec_helper'
describe
MattermostSlashCommandsService
,
:models
do
it_behaves_like
"chat slash commands service"
describe
'#configure
!
'
do
describe
'#configure'
do
let
(
:project
)
{
create
(
:empty_project
)
}
let
(
:service
)
{
project
.
build_mattermost_slash_commands_service
}
let
(
:user
)
{
create
(
:user
)}
before
do
allow_any_instance_of
(
Mattermost
::
Session
).
to
receive
(
:with_session
).
and_yield
end
subject
do
service
.
configure
!
(
user
,
team_id:
'abc'
,
service
.
configure
(
user
,
team_id:
'abc'
,
trigger:
'gitlab'
,
url:
'http://trigger.url'
,
icon_url:
'http://icon.url/icon.png'
)
end
context
'the requests succeeds'
do
before
do
allow_any_instance_of
(
Mattermost
::
Command
).
to
receive
(
:json_post
).
and_return
(
'token'
=>
'token'
)
end
it
'saves the service'
do
expect
{
subject
}.
to
change
{
project
.
services
.
count
}.
by
(
1
)
end
...
...
@@ -27,13 +27,16 @@ describe MattermostSlashCommandsService, :models do
it
'saves the token'
do
subject
expect
(
service
.
reload
.
token
).
to
eq
(
'
mynew
token'
)
expect
(
service
.
reload
.
token
).
to
eq
(
'token'
)
end
end
context
'an error is received'
do
it
'shows error messages'
do
expect
(
subject
).
to
raise_error
(
"Error"
)
succeeded
,
message
=
subject
expect
(
succeeded
).
to
be
(
false
)
expect
(
message
).
to
start_with
(
"Failed to open TCP connection to"
)
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