diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-01 03:10:06 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-01 03:10:06 +0000 |
commit | f5823d9c245c6186ac27265af22927bda40f33f7 (patch) | |
tree | a0dbad34c05e495b55264a5d4c5ed09d3fdfbdf9 /spec/features | |
parent | 65340d918f4020d29cba05e0d91e6e44fff6092a (diff) | |
download | gitlab-ce-f5823d9c245c6186ac27265af22927bda40f33f7.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features')
-rw-r--r-- | spec/features/boards/sidebar_assignee_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/projects/services/user_activates_slack_notifications_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/features/boards/sidebar_assignee_spec.rb b/spec/features/boards/sidebar_assignee_spec.rb index d6adefea6e3..63553cec89b 100644 --- a/spec/features/boards/sidebar_assignee_spec.rb +++ b/spec/features/boards/sidebar_assignee_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Project issue boards sidebar assignee', :js do +RSpec.describe 'Project issue boards sidebar assignee', :js, quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/332230' do include BoardHelpers let_it_be(:user) { create(:user) } diff --git a/spec/features/projects/services/user_activates_slack_notifications_spec.rb b/spec/features/projects/services/user_activates_slack_notifications_spec.rb index 0cba1ee1c4c..dec83ff1489 100644 --- a/spec/features/projects/services/user_activates_slack_notifications_spec.rb +++ b/spec/features/projects/services/user_activates_slack_notifications_spec.rb @@ -20,7 +20,7 @@ RSpec.describe 'User activates Slack notifications', :js do end context 'when service is already configured' do - let(:service) { SlackService.new } + let(:service) { Integrations::Slack.new } let(:project) { create(:project, slack_service: service) } before do |