diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-01-31 11:40:27 +0000 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-01-31 11:40:27 +0000 |
commit | e4bcdddfa79d855e7f320a8d91e79e17d2e1bf5f (patch) | |
tree | 773ec4112b83aed98c1c4faefd1b0f60e2640d7c /spec/models/project_services | |
parent | 223f1f3d2dd95d6b87a485ce0df6f4fef77eb522 (diff) | |
parent | bd5245dba67b4aa4fccce819e4491259d568240b (diff) | |
download | gitlab-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/models/project_services')
-rw-r--r-- | spec/models/project_services/mattermost_slash_commands_service_spec.rb | 5 |
1 files changed, 1 insertions, 4 deletions
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 c879edddfdd..98f3d420c8a 100644 --- a/spec/models/project_services/mattermost_slash_commands_service_spec.rb +++ b/spec/models/project_services/mattermost_slash_commands_service_spec.rb @@ -113,10 +113,7 @@ describe MattermostSlashCommandsService, :models do end it 'shows error messages' do - teams, message = subject - - expect(teams).to be_empty - expect(message).to eq('Failed to get team list.') + expect(subject).to eq([[], "Failed to get team list."]) end end end |