Commit 92615f40 authored by Kerri Miller's avatar Kerri Miller

Reverse assignment of prev/next_commit_id

parent f992a23d
......@@ -99,7 +99,7 @@ class DiffsEntity < Grape::Entity
end
def commit_options(options)
prev_commit_id, next_commit_id = *commit_neighbors(options[:commit]&.id)
next_commit_id, prev_commit_id = *commit_neighbors(options[:commit]&.id)
options.merge(
type: :full,
......
......@@ -45,26 +45,26 @@ describe DiffsEntity do
let(:commit) { commits.third }
it 'includes commit references for previous and next' do
expect(subject[:commit][:prev_commit_id]).to eq(commits.second.id)
expect(subject[:commit][:next_commit_id]).to eq(commits.fourth.id)
expect(subject[:commit][:next_commit_id]).to eq(commits.second.id)
expect(subject[:commit][:prev_commit_id]).to eq(commits.fourth.id)
end
end
context "when the passed commit is the first in the group" do
let(:commit) { commits.first }
it 'includes commit references for nil and next' do
expect(subject[:commit][:prev_commit_id]).to be_nil
expect(subject[:commit][:next_commit_id]).to eq(commits.second.id)
it 'includes commit references for nil and previous commit' do
expect(subject[:commit][:next_commit_id]).to be_nil
expect(subject[:commit][:prev_commit_id]).to eq(commits.second.id)
end
end
context "when the passed commit is the last in the group" do
let(:commit) { commits.last }
it 'includes commit references for previous and nil' do
expect(subject[:commit][:prev_commit_id]).to eq(commits[-2].id)
expect(subject[:commit][:next_commit_id]).to be_nil
it 'includes commit references for the next and nil' do
expect(subject[:commit][:next_commit_id]).to eq(commits[-2].id)
expect(subject[:commit][:prev_commit_id]).to be_nil
end
end
end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment