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
path: root/spec
diff options
context:
space:
mode:
authorFlorent (HP) <baldinof@gmail.com>2015-08-09 21:31:50 +0300
committerFlorent (HP) <baldinof@gmail.com>2015-08-12 00:00:46 +0300
commit8adf6ba8f5bf9086ec3f9bb54ad801deb4d41924 (patch)
tree30ecdf365b62f85c0645d10502d55e05047f6548 /spec
parentcb6ad67f52c9e849e0f8ca34b2fff47c585bd816 (diff)
Add merged label on branches page
Diffstat (limited to 'spec')
-rw-r--r--spec/models/repository_spec.rb20
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 }