summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZ.J. van de Weg <git@zjvandeweg.nl>2016-12-20 20:56:46 +0100
committerZ.J. van de Weg <git@zjvandeweg.nl>2016-12-20 20:57:09 +0100
commit4a03fae930a58b485ee610ce9e6058a2c2dd3d6e (patch)
tree418163b6578935b3660de4da67ab0e946f80acf6
parent0bd8669f3a606479e3f97683e0bfb178856df422 (diff)
downloadgitlab-ce-4a03fae930a58b485ee610ce9e6058a2c2dd3d6e.tar.gz
Fix rspec tests due to different API
[ci skip]
-rw-r--r--lib/mattermost/session.rb4
-rw-r--r--spec/features/projects/services/mattermost_slash_command_spec.rb12
-rw-r--r--spec/lib/mattermost/command_spec.rb15
-rw-r--r--spec/lib/mattermost/team_spec.rb17
-rw-r--r--spec/models/project_services/mattermost_slash_commands_service_spec.rb21
5 files changed, 33 insertions, 36 deletions
diff --git a/lib/mattermost/session.rb b/lib/mattermost/session.rb
index 38a71061097..8f14ed306b8 100644
--- a/lib/mattermost/session.rb
+++ b/lib/mattermost/session.rb
@@ -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 = {})
diff --git a/spec/features/projects/services/mattermost_slash_command_spec.rb b/spec/features/projects/services/mattermost_slash_command_spec.rb
index 73ecf86aded..274d50e7ce4 100644
--- a/spec/features/projects/services/mattermost_slash_command_spec.rb
+++ b/spec/features/projects/services/mattermost_slash_command_spec.rb
@@ -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
diff --git a/spec/lib/mattermost/command_spec.rb b/spec/lib/mattermost/command_spec.rb
index ecf336e3199..f70aee7f3e5 100644
--- a/spec/lib/mattermost/command_spec.rb
+++ b/spec/lib/mattermost/command_spec.rb
@@ -1,17 +1,22 @@
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
diff --git a/spec/lib/mattermost/team_spec.rb b/spec/lib/mattermost/team_spec.rb
index 5d1fc6fc603..ef39c456d5f 100644
--- a/spec/lib/mattermost/team_spec.rb
+++ b/spec/lib/mattermost/team_spec.rb
@@ -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
diff --git a/spec/models/project_services/mattermost_slash_commands_service_spec.rb b/spec/models/project_services/mattermost_slash_commands_service_spec.rb
index 07662d2d89a..850ca45ddd8 100644
--- a/spec/models/project_services/mattermost_slash_commands_service_spec.rb
+++ b/spec/models/project_services/mattermost_slash_commands_service_spec.rb
@@ -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('mynewtoken')
+ 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