summaryrefslogtreecommitdiff
path: root/spec/models/compare_spec.rb
diff options
context:
space:
mode:
Diffstat (limited to 'spec/models/compare_spec.rb')
-rw-r--r--spec/models/compare_spec.rb54
1 files changed, 24 insertions, 30 deletions
diff --git a/spec/models/compare_spec.rb b/spec/models/compare_spec.rb
index 0bc3ee014e6..832eb9cbfed 100644
--- a/spec/models/compare_spec.rb
+++ b/spec/models/compare_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
describe Compare do
include RepoHelpers
@@ -13,32 +13,32 @@ describe Compare do
subject { described_class.new(raw_compare, project) }
- describe '#start_commit' do
- it 'returns raw compare base commit' do
+ describe "#start_commit" do
+ it "returns raw compare base commit" do
expect(subject.start_commit.id).to eq(start_commit.id)
end
- it 'returns nil if compare base commit is nil' do
+ it "returns nil if compare base commit is nil" do
expect(raw_compare).to receive(:base).and_return(nil)
expect(subject.start_commit).to eq(nil)
end
end
- describe '#commit' do
- it 'returns raw compare head commit' do
+ describe "#commit" do
+ it "returns raw compare head commit" do
expect(subject.commit.id).to eq(head_commit.id)
end
- it 'returns nil if compare head commit is nil' do
+ it "returns nil if compare head commit is nil" do
expect(raw_compare).to receive(:head).and_return(nil)
expect(subject.commit).to eq(nil)
end
end
- describe '#base_commit_sha' do
- it 'returns @base_sha if it is present' do
+ describe "#base_commit_sha" do
+ it "returns @base_sha if it is present" do
expect(project).not_to receive(:merge_base_commit)
sha = double
@@ -47,7 +47,7 @@ describe Compare do
expect(service.base_commit_sha).to eq(sha)
end
- it 'fetches merge base SHA from repo when @base_sha is nil' do
+ it "fetches merge base SHA from repo when @base_sha is nil" do
expect(project).to receive(:merge_base_commit)
.with(start_commit.id, head_commit.id)
.once
@@ -57,7 +57,7 @@ describe Compare do
.to eq(project.repository.merge_base(start_commit.id, head_commit.id))
end
- it 'is memoized on first call' do
+ it "is memoized on first call" do
expect(project).to receive(:merge_base_commit)
.with(start_commit.id, head_commit.id)
.once
@@ -66,57 +66,51 @@ describe Compare do
3.times { subject.base_commit_sha }
end
- it 'returns nil if there is no start_commit' do
+ it "returns nil if there is no start_commit" do
expect(subject).to receive(:start_commit).and_return(nil)
expect(subject.base_commit_sha).to eq(nil)
end
- it 'returns nil if there is no head commit' do
+ it "returns nil if there is no head commit" do
expect(subject).to receive(:head_commit).and_return(nil)
expect(subject.base_commit_sha).to eq(nil)
end
end
- describe '#diff_refs' do
- it 'uses base_commit_sha sha as base_sha' do
+ describe "#diff_refs" do
+ it "uses base_commit_sha sha as base_sha" do
expect(subject.diff_refs.base_sha).to eq(subject.base_commit_sha)
end
- it 'uses start_commit sha as start_sha' do
+ it "uses start_commit sha as start_sha" do
expect(subject.diff_refs.start_sha).to eq(start_commit.id)
end
- it 'uses commit sha as head sha' do
+ it "uses commit sha as head sha" do
expect(subject.diff_refs.head_sha).to eq(head_commit.id)
end
end
- describe '#modified_paths' do
- context 'changes are present' do
+ describe "#modified_paths" do
+ context "changes are present" do
let(:raw_compare) do
Gitlab::Git::Compare.new(
- project.repository.raw_repository, 'before-create-delete-modify-move', 'after-create-delete-modify-move'
+ project.repository.raw_repository, "before-create-delete-modify-move", "after-create-delete-modify-move"
)
end
- it 'returns affected file paths, without duplication' do
- expect(subject.modified_paths).to contain_exactly(*%w{
- foo/for_move.txt
- foo/bar/for_move.txt
- foo/for_create.txt
- foo/for_delete.txt
- foo/for_edit.txt
- })
+ it "returns affected file paths, without duplication" do
+ expect(subject.modified_paths).to contain_exactly("foo/for_move.txt", "foo/bar/for_move.txt", "foo/for_create.txt", "foo/for_delete.txt", "foo/for_edit.txt")
end
end
- context 'changes are absent' do
+ context "changes are absent" do
let(:start_commit) { sample_commit }
let(:head_commit) { sample_commit }
- it 'returns empty array' do
+ it "returns empty array" do
expect(subject.modified_paths).to eq([])
end
end