summaryrefslogtreecommitdiff
path: root/spec/controllers
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2017-01-31 11:40:27 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2017-01-31 11:40:27 +0000
commite4bcdddfa79d855e7f320a8d91e79e17d2e1bf5f (patch)
tree773ec4112b83aed98c1c4faefd1b0f60e2640d7c /spec/controllers
parent223f1f3d2dd95d6b87a485ce0df6f4fef77eb522 (diff)
parentbd5245dba67b4aa4fccce819e4491259d568240b (diff)
downloadgitlab-ce-e4bcdddfa79d855e7f320a8d91e79e17d2e1bf5f.tar.gz
Merge branch 'zj-display-error-team-fetch' into 'master'
Fix inconsistent return type Closes #27150 See merge request !8290
Diffstat (limited to 'spec/controllers')
-rw-r--r--spec/controllers/projects/mattermosts_controller_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/controllers/projects/mattermosts_controller_spec.rb b/spec/controllers/projects/mattermosts_controller_spec.rb
index 2ae635a1244..cae733f0cfb 100644
--- a/spec/controllers/projects/mattermosts_controller_spec.rb
+++ b/spec/controllers/projects/mattermosts_controller_spec.rb
@@ -13,13 +13,13 @@ describe Projects::MattermostsController do
before do
allow_any_instance_of(MattermostSlashCommandsService).
to receive(:list_teams).and_return([])
+ end
+ it 'accepts the request' do
get(:new,
namespace_id: project.namespace.to_param,
project_id: project.to_param)
- end
- it 'accepts the request' do
expect(response).to have_http_status(200)
end
end