diff options
author | Lin Jen-Shin (godfat) <godfat@godfat.org> | 2017-10-27 18:55:08 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-10-27 18:55:08 +0300 |
commit | 57d7ed05d96928f7e33135e7397bdd6b3b0d25e0 (patch) | |
tree | cc5f65076fc0acc1b5ff191d502a706e797544af /spec/models/repository_spec.rb | |
parent | 7c4da276d34e008b5aa86971cfd627a813d84df7 (diff) |
Fetch the merged branches at once
Diffstat (limited to 'spec/models/repository_spec.rb')
-rw-r--r-- | spec/models/repository_spec.rb | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb index 455d5e8a656..d7c07676911 100644 --- a/spec/models/repository_spec.rb +++ b/spec/models/repository_spec.rb @@ -299,6 +299,24 @@ describe Repository do it { is_expected.to be_falsey } end + + context 'when pre-loaded merged branches are provided' do + using RSpec::Parameterized::TableSyntax + + where(:branch, :pre_loaded, :expected) do + 'not-merged-branch' | ['branch-merged'] | false + 'branch-merged' | ['not-merged-branch'] | false + 'branch-merged' | ['branch-merged'] | true + 'not-merged-branch' | ['not-merged-branch'] | false + 'master' | ['master'] | false + end + + with_them do + subject { repository.merged_to_root_ref?(branch, pre_loaded) } + + it { is_expected.to eq(expected) } + end + end end describe '#can_be_merged?' do |