Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'spec/workers/rebase_worker_spec.rb')
-rw-r--r--spec/workers/rebase_worker_spec.rb14
1 files changed, 8 insertions, 6 deletions
diff --git a/spec/workers/rebase_worker_spec.rb b/spec/workers/rebase_worker_spec.rb
index 4bdfd7219f2..ee8fd8b7461 100644
--- a/spec/workers/rebase_worker_spec.rb
+++ b/spec/workers/rebase_worker_spec.rb
@@ -2,7 +2,7 @@
require 'spec_helper'
-RSpec.describe RebaseWorker, '#perform' do
+RSpec.describe RebaseWorker, '#perform', feature_category: :source_code_management do
include ProjectForksHelper
context 'when rebasing an MR from a fork where upstream has protected branches' do
@@ -10,11 +10,13 @@ RSpec.describe RebaseWorker, '#perform' do
let(:forked_project) { fork_project(upstream_project, nil, repository: true) }
let(:merge_request) do
- create(:merge_request,
- source_project: forked_project,
- source_branch: 'feature_conflict',
- target_project: upstream_project,
- target_branch: 'master')
+ create(
+ :merge_request,
+ source_project: forked_project,
+ source_branch: 'feature_conflict',
+ target_project: upstream_project,
+ target_branch: 'master'
+ )
end
it 'sets the correct project for running hooks' do