diff options
author | Florent (HP) <baldinof@gmail.com> | 2015-08-09 20:31:50 +0200 |
---|---|---|
committer | Florent (HP) <baldinof@gmail.com> | 2015-08-11 23:00:46 +0200 |
commit | 8adf6ba8f5bf9086ec3f9bb54ad801deb4d41924 (patch) | |
tree | 30ecdf365b62f85c0645d10502d55e05047f6548 /spec | |
parent | cb6ad67f52c9e849e0f8ca34b2fff47c585bd816 (diff) | |
download | gitlab-ce-8adf6ba8f5bf9086ec3f9bb54ad801deb4d41924.tar.gz |
Add merged label on branches page
Diffstat (limited to 'spec')
-rw-r--r-- | spec/models/repository_spec.rb | 20 |
1 files changed, 20 insertions, 0 deletions
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 } |