From 95ca6584d86e9f571c7f677ccf24487b6dd9df6f Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Sat, 25 Apr 2015 14:46:06 -0400
Subject: [PATCH] Add CommitRange directly to results Hash
---
lib/gitlab/markdown/commit_range_reference_filter.rb | 2 +-
spec/lib/gitlab/reference_extractor_spec.rb | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/gitlab/markdown/commit_range_reference_filter.rb b/lib/gitlab/markdown/commit_range_reference_filter.rb
index c37bb9463bd..8764f7e474f 100644
--- a/lib/gitlab/markdown/commit_range_reference_filter.rb
+++ b/lib/gitlab/markdown/commit_range_reference_filter.rb
@@ -56,7 +56,7 @@ module Gitlab
range = CommitRange.new(id, project)
if range.valid_commits?
- push_result(:commit_range, range.to_a)
+ push_result(:commit_range, range)
url = url_for_commit_range(project, range)
diff --git a/spec/lib/gitlab/reference_extractor_spec.rb b/spec/lib/gitlab/reference_extractor_spec.rb
index e339f378d54..9801dc16554 100644
--- a/spec/lib/gitlab/reference_extractor_spec.rb
+++ b/spec/lib/gitlab/reference_extractor_spec.rb
@@ -65,12 +65,12 @@ describe Gitlab::ReferenceExtractor do
earlier_commit = project.commit('master~2')
subject.analyze("this references commits #{earlier_commit.sha[0..6]}...#{commit.sha[0..6]}")
+
extracted = subject.commit_ranges
expect(extracted.size).to eq(1)
- expect(extracted[0][0].sha).to eq(earlier_commit.sha)
- expect(extracted[0][0].message).to eq(earlier_commit.message)
- expect(extracted[0][1].sha).to eq(commit.sha)
- expect(extracted[0][1].message).to eq(commit.message)
+ expect(extracted.first).to be_kind_of(CommitRange)
+ expect(extracted.first.commit_from).to eq earlier_commit
+ expect(extracted.first.commit_to).to eq commit
end
context 'with a project with an underscore' do
--
GitLab