summaryrefslogtreecommitdiff
path: root/spec/controllers/projects/mattermosts_controller_spec.rb
diff options
context:
space:
mode:
authorZ.J. van de Weg <git@zjvandeweg.nl>2016-12-21 13:34:24 +0100
committerZ.J. van de Weg <git@zjvandeweg.nl>2016-12-21 14:11:00 +0100
commit1ac06396778dec216cf0467a50c67040690656ca (patch)
tree5eec9ef1796de30c374f5489cccfd83b3f261bb3 /spec/controllers/projects/mattermosts_controller_spec.rb
parent55c61d2e412733b0feefcb5fa33a96e584ffe2bc (diff)
downloadgitlab-ce-1ac06396778dec216cf0467a50c67040690656ca.tar.gz
Add new tests
Diffstat (limited to 'spec/controllers/projects/mattermosts_controller_spec.rb')
-rw-r--r--spec/controllers/projects/mattermosts_controller_spec.rb7
1 files changed, 6 insertions, 1 deletions
diff --git a/spec/controllers/projects/mattermosts_controller_spec.rb b/spec/controllers/projects/mattermosts_controller_spec.rb
index 3f9482b0cde..2ae635a1244 100644
--- a/spec/controllers/projects/mattermosts_controller_spec.rb
+++ b/spec/controllers/projects/mattermosts_controller_spec.rb
@@ -11,6 +11,9 @@ describe Projects::MattermostsController do
describe 'GET #new' do
before do
+ allow_any_instance_of(MattermostSlashCommandsService).
+ to receive(:list_teams).and_return([])
+
get(:new,
namespace_id: project.namespace.to_param,
project_id: project.to_param)
@@ -33,7 +36,9 @@ describe Projects::MattermostsController do
context 'no request can be made to mattermost' do
it 'shows the error' do
- expect(controller).to set_flash[:alert].to /\AFailed to open TCP connection to/
+ allow_any_instance_of(MattermostSlashCommandsService).to receive(:configure).and_return([false, "error message"])
+
+ expect(subject).to redirect_to(new_namespace_project_mattermost_url(project.namespace, project))
end
end