From c11d3c5789f2d77059b6d132af7b9fda9651ede5 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Thu, 23 Apr 2015 13:52:35 -0400
Subject: [PATCH] Remove param from CommitRange#to_s
---
app/models/commit_range.rb | 8 ++------
spec/models/commit_range_spec.rb | 20 ++++----------------
2 files changed, 6 insertions(+), 22 deletions(-)
diff --git a/app/models/commit_range.rb b/app/models/commit_range.rb
index 19b1a218e45..66daa072c9e 100644
--- a/app/models/commit_range.rb
+++ b/app/models/commit_range.rb
@@ -67,12 +67,8 @@ class CommitRange
end
end
- def to_s(short: true)
- if short
- "#{sha_from[0..7]}#{notation}#{sha_to[0..7]}"
- else
- "#{sha_from}#{notation}#{sha_to}"
- end
+ def to_s
+ "#{sha_from[0..7]}#{notation}#{sha_to[0..7]}"
end
# Returns a String for use in a link's title attribute
diff --git a/spec/models/commit_range_spec.rb b/spec/models/commit_range_spec.rb
index 474d60ff091..8412c7d2140 100644
--- a/spec/models/commit_range_spec.rb
+++ b/spec/models/commit_range_spec.rb
@@ -39,24 +39,12 @@ describe CommitRange do
end
describe '#to_s' do
- context 'with short IDs' do
- it 'is correct for three-dot syntax' do
- expect(range.to_s).to eq "#{sha_from[0..7]}...#{sha_to[0..7]}"
- end
-
- it 'is correct for two-dot syntax' do
- expect(range2.to_s).to eq "#{sha_from[0..7]}..#{sha_to[0..7]}"
- end
+ it 'is correct for three-dot syntax' do
+ expect(range.to_s).to eq "#{sha_from[0..7]}...#{sha_to[0..7]}"
end
- context 'with full IDs' do
- it 'is correct for three-dot syntax' do
- expect(range.to_s(short: false)).to eq "#{sha_from}...#{sha_to}"
- end
-
- it 'is correct for two-dot syntax' do
- expect(range2.to_s(short: false)).to eq "#{sha_from}..#{sha_to}"
- end
+ it 'is correct for two-dot syntax' do
+ expect(range2.to_s).to eq "#{sha_from[0..7]}..#{sha_to[0..7]}"
end
end
--
GitLab