From 8adf6ba8f5bf9086ec3f9bb54ad801deb4d41924 Mon Sep 17 00:00:00 2001 From: "Florent (HP)" Date: Sun, 9 Aug 2015 20:31:50 +0200 Subject: Add merged label on branches page --- spec/models/repository_spec.rb | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'spec') diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb index 0927cde61a6..8e2849691ff 100644 --- a/spec/models/repository_spec.rb +++ b/spec/models/repository_spec.rb @@ -34,6 +34,26 @@ describe Repository do end end + describe :merged_to_root_ref? do + context 'merged branch' do + subject { repository.merged_to_root_ref?('improve/awesome') } + + it { is_expected.to be_truthy } + end + + context 'non merged branch' do + subject { repository.merged_to_root_ref?('fix') } + + it { is_expected.to be_falsey } + end + + context 'non existent branch' do + subject { repository.merged_to_root_ref?('non_existent_branch') } + + it { is_expected.to be_nil } + end + end + describe "search_files" do let(:results) { repository.search_files('feature', 'master') } subject { results } -- cgit v1.2.3