summaryrefslogtreecommitdiff
path: root/spec/models
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2017-08-08 14:27:22 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2017-08-08 14:27:22 +0000
commit14391151832e0fdd709c08d0d3f704b47b1d4e4e (patch)
tree270be924e37becffbfd418729f1f696acf3e12f9 /spec/models
parent2aa460de76840d469071f17df9433c614e700e6e (diff)
parent3ce6f03f1437633c9328dc30aa5272a49368655b (diff)
downloadgitlab-ce-14391151832e0fdd709c08d0d3f704b47b1d4e4e.tar.gz
Merge branch 'gitaly-find-commit' into 'master'
Incorporate Gitaly's CommitService.FindCommit RPC Closes gitaly#402 See merge request !13094
Diffstat (limited to 'spec/models')
-rw-r--r--spec/models/commit_spec.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/spec/models/commit_spec.rb b/spec/models/commit_spec.rb
index 08693b5da33..c18c635d811 100644
--- a/spec/models/commit_spec.rb
+++ b/spec/models/commit_spec.rb
@@ -33,7 +33,6 @@ describe Commit do
describe '#to_reference' do
let(:project) { create(:project, :repository, path: 'sample-project') }
- let(:commit) { project.commit }
it 'returns a String reference to the object' do
expect(commit.to_reference).to eq commit.id
@@ -47,7 +46,6 @@ describe Commit do
describe '#reference_link_text' do
let(:project) { create(:project, :repository, path: 'sample-project') }
- let(:commit) { project.commit }
it 'returns a String reference to the object' do
expect(commit.reference_link_text).to eq commit.short_id
@@ -191,7 +189,7 @@ eos
it { expect(data).to be_a(Hash) }
it { expect(data[:message]).to include('adds bar folder and branch-test text file to check Repository merged_to_root_ref method') }
- it { expect(data[:timestamp]).to eq('2016-09-27T14:37:46+00:00') }
+ it { expect(data[:timestamp]).to eq('2016-09-27T14:37:46Z') }
it { expect(data[:added]).to eq(["bar/branch-test.txt"]) }
it { expect(data[:modified]).to eq([]) }
it { expect(data[:removed]).to eq([]) }