diff options
Diffstat (limited to 'spec/factories/merge_requests.rb')
-rw-r--r-- | spec/factories/merge_requests.rb | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/spec/factories/merge_requests.rb b/spec/factories/merge_requests.rb index 3d12ff98257..28a3f76d485 100644 --- a/spec/factories/merge_requests.rb +++ b/spec/factories/merge_requests.rb @@ -16,36 +16,36 @@ FactoryBot.define do # # See also RepoHelpers.sample_compare # - source_branch "master" - target_branch "feature" + source_branch { "master" } + target_branch { "feature" } - merge_status "can_be_merged" + merge_status { "can_be_merged" } trait :with_diffs do end trait :with_image_diffs do - source_branch "add_images_and_changes" - target_branch "master" + source_branch { "add_images_and_changes" } + target_branch { "master" } end trait :without_diffs do - source_branch "improve/awesome" - target_branch "master" + source_branch { "improve/awesome" } + target_branch { "master" } end trait :conflict do - source_branch "feature_conflict" - target_branch "feature" + source_branch { "feature_conflict" } + target_branch { "feature" } end trait :merged do - state :merged + state { :merged } end trait :merged_target do - source_branch "merged-target" - target_branch "improve/awesome" + source_branch { "merged-target" } + target_branch { "improve/awesome" } end trait :merged_last_month do @@ -57,7 +57,7 @@ FactoryBot.define do end trait :closed do - state :closed + state { :closed } end trait :closed_last_month do @@ -69,36 +69,36 @@ FactoryBot.define do end trait :opened do - state :opened + state { :opened } end trait :invalid do - source_branch "feature_one" - target_branch "feature_two" + source_branch { "feature_one" } + target_branch { "feature_two" } end trait :locked do - state :locked + state { :locked } end trait :simple do - source_branch "feature" - target_branch "master" + source_branch { "feature" } + target_branch { "master" } end trait :rebased do - source_branch "markdown" - target_branch "improve/awesome" + source_branch { "markdown" } + target_branch { "improve/awesome" } end trait :diverged do - source_branch "feature" - target_branch "master" + source_branch { "feature" } + target_branch { "master" } end trait :merge_when_pipeline_succeeds do - auto_merge_enabled true - auto_merge_strategy AutoMergeService::STRATEGY_MERGE_WHEN_PIPELINE_SUCCEEDS + auto_merge_enabled { true } + auto_merge_strategy { AutoMergeService::STRATEGY_MERGE_WHEN_PIPELINE_SUCCEEDS } merge_user { author } end @@ -162,7 +162,7 @@ FactoryBot.define do end trait :deployed_review_app do - target_branch 'pages-deploy-target' + target_branch { 'pages-deploy-target' } transient do deployment { create(:deployment, :review_app) } @@ -203,7 +203,7 @@ FactoryBot.define do factory :labeled_merge_request do transient do - labels [] + labels { [] } end after(:create) do |merge_request, evaluator| |