From 1769b59b9fd05325e3016b1a53a82ae6cf56adb5 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 1 Apr 2021 18:13:56 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/lib/mattermost/command_spec.rb | 2 +- spec/lib/mattermost/session_spec.rb | 2 +- spec/lib/mattermost/team_spec.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'spec/lib/mattermost') diff --git a/spec/lib/mattermost/command_spec.rb b/spec/lib/mattermost/command_spec.rb index 26d1ec32232..0f2711e0b11 100644 --- a/spec/lib/mattermost/command_spec.rb +++ b/spec/lib/mattermost/command_spec.rb @@ -19,7 +19,7 @@ RSpec.describe Mattermost::Command do trigger: 'gitlab' } end - subject { described_class.new(nil).create(params) } + subject { described_class.new(nil).create(params) } # rubocop:disable Rails/SaveBang context 'for valid trigger word' do before do diff --git a/spec/lib/mattermost/session_spec.rb b/spec/lib/mattermost/session_spec.rb index 93422b01ca7..67ccb48e3a7 100644 --- a/spec/lib/mattermost/session_spec.rb +++ b/spec/lib/mattermost/session_spec.rb @@ -39,7 +39,7 @@ RSpec.describe Mattermost::Session, type: :request do context 'with oauth_uri' do let!(:doorkeeper) do - Doorkeeper::Application.create( + Doorkeeper::Application.create!( name: 'GitLab Mattermost', redirect_uri: "#{mattermost_url}/signup/gitlab/complete\n#{mattermost_url}/login/gitlab/complete", scopes: '') diff --git a/spec/lib/mattermost/team_spec.rb b/spec/lib/mattermost/team_spec.rb index 0870114ca28..e3ef5ff5377 100644 --- a/spec/lib/mattermost/team_spec.rb +++ b/spec/lib/mattermost/team_spec.rb @@ -71,7 +71,7 @@ RSpec.describe Mattermost::Team do end describe '#create' do - subject { described_class.new(nil).create(name: "devteam", display_name: "Dev Team", type: "O") } + subject { described_class.new(nil).create(name: "devteam", display_name: "Dev Team", type: "O") } # rubocop:disable Rails/SaveBang context 'for a new team' do let(:response) do -- cgit v1.2.3