diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-12 09:10:23 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-12 09:10:23 +0300 |
commit | a20bd972bcc5e653641e6291a80957ce85958988 (patch) | |
tree | 8ecd6106daa1d4e36a768d491385a747a0e7f44a /spec/controllers/projects | |
parent | f78f3d867871ce9ad79e5fcb8e4e3e8ffda37200 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers/projects')
-rw-r--r-- | spec/controllers/projects/hooks_controller_spec.rb | 2 | ||||
-rw-r--r-- | spec/controllers/projects/services_controller_spec.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/spec/controllers/projects/hooks_controller_spec.rb b/spec/controllers/projects/hooks_controller_spec.rb index 17baf38ef32..2ab18ccddbf 100644 --- a/spec/controllers/projects/hooks_controller_spec.rb +++ b/spec/controllers/projects/hooks_controller_spec.rb @@ -109,7 +109,7 @@ RSpec.describe Projects::HooksController do describe '#test' do let(:hook) { create(:project_hook, project: project) } - context 'when the endpoint receives requests above the limit' do + context 'when the endpoint receives requests above the limit', :freeze_time, :clean_gitlab_redis_rate_limiting do before do allow(Gitlab::ApplicationRateLimiter).to receive(:rate_limits) .and_return(project_testing_hook: { threshold: 1, interval: 1.minute }) diff --git a/spec/controllers/projects/services_controller_spec.rb b/spec/controllers/projects/services_controller_spec.rb index 79784bad67e..29988da6e60 100644 --- a/spec/controllers/projects/services_controller_spec.rb +++ b/spec/controllers/projects/services_controller_spec.rb @@ -254,7 +254,7 @@ RSpec.describe Projects::ServicesController do let_it_be(:project) { create(:project, group: group) } let_it_be(:jira_integration) { create(:jira_integration, project: project) } - let(:group_integration) { create(:jira_integration, group: group, project: nil, url: 'http://group.com', password: 'group') } + let(:group_integration) { create(:jira_integration, :group, group: group, url: 'http://group.com', password: 'group') } let(:integration_params) { { inherit_from_id: group_integration.id, url: 'http://custom.com', password: 'custom' } } it 'ignores submitted params and inherits group settings' do @@ -269,7 +269,7 @@ RSpec.describe Projects::ServicesController do context 'when param `inherit_from_id` is set to an unrelated group' do let_it_be(:group) { create(:group) } - let(:group_integration) { create(:jira_integration, group: group, project: nil, url: 'http://group.com', password: 'group') } + let(:group_integration) { create(:jira_integration, :group, group: group, url: 'http://group.com', password: 'group') } let(:integration_params) { { inherit_from_id: group_integration.id, url: 'http://custom.com', password: 'custom' } } it 'ignores the param and saves the submitted settings' do |