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:
authorSean McGivern <sean@mcgivern.me.uk>2017-10-03 11:24:31 +0300
committerSean McGivern <sean@mcgivern.me.uk>2017-10-03 11:24:31 +0300
commit0ac06c89e9cfc0fc8044b645294242d66af36150 (patch)
treecf72e186622982907975f06fc588c0542a56c35c /spec/models/project_spec.rb
parent75f257ad57d29955fc25c49b39fb1833f7dd3c75 (diff)
parente559b8511b2817b9c57a5190ff9ed95c739528bf (diff)
Merge branch 'ff_port_from_ee' into 'master'
Move Fast-Forward Merge to CE See merge request gitlab-org/gitlab-ce!14272
Diffstat (limited to 'spec/models/project_spec.rb')
-rw-r--r--spec/models/project_spec.rb12
1 files changed, 12 insertions, 0 deletions
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index c94481d53c3..176bb568cbe 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -408,6 +408,18 @@ describe Project do
end
end
+ describe '#merge_method' do
+ it 'returns "ff" merge_method when ff is enabled' do
+ project = build(:project, merge_requests_ff_only_enabled: true)
+ expect(project.merge_method).to be :ff
+ end
+
+ it 'returns "merge" merge_method when ff is disabled' do
+ project = build(:project, merge_requests_ff_only_enabled: false)
+ expect(project.merge_method).to be :merge
+ end
+ end
+
describe '#repository_storage_path' do
let(:project) { create(:project, repository_storage: 'custom') }