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:
authorOswaldo Ferreira <oswaldo@gitlab.com>2019-02-12 13:22:44 +0300
committerOswaldo Ferreira <oswaldo@gitlab.com>2019-02-25 16:41:02 +0300
commit4e16edbe0a26d95ea94ad61ebaadac4f7463352b (patch)
tree1a92fb9c26041034e6b86aaf1507601ae30e42c0 /spec/services
parent105212ce49007ffc3489c2039e55056d8df8fa95 (diff)
Add feature-flag support
Returns error in MergeToRefService when merge_to_tmp_merge_ref_path ff is disabled.
Diffstat (limited to 'spec/services')
-rw-r--r--spec/services/merge_requests/merge_to_ref_service_spec.rb9
1 files changed, 9 insertions, 0 deletions
diff --git a/spec/services/merge_requests/merge_to_ref_service_spec.rb b/spec/services/merge_requests/merge_to_ref_service_spec.rb
index 696f1b83157..96f2fde7117 100644
--- a/spec/services/merge_requests/merge_to_ref_service_spec.rb
+++ b/spec/services/merge_requests/merge_to_ref_service_spec.rb
@@ -74,6 +74,15 @@ describe MergeRequests::MergeToRefService do
process_merge_to_ref
end
+ it 'returns error when feature is disabled' do
+ stub_feature_flags(merge_to_tmp_merge_ref_path: false)
+
+ result = service.execute(merge_request)
+
+ expect(result[:status]).to eq(:error)
+ expect(result[:message]).to eq('Feature is not enabled')
+ end
+
it 'returns an error when the failing to process the merge' do
allow(project.repository).to receive(:merge_to_ref).and_return(nil)