diff options
Diffstat (limited to 'spec/models/repository_spec.rb')
| -rw-r--r-- | spec/models/repository_spec.rb | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb index e9e6abb0d5f..27f0a99b2fa 100644 --- a/spec/models/repository_spec.rb +++ b/spec/models/repository_spec.rb @@ -299,24 +299,6 @@ 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 |