summaryrefslogtreecommitdiff
path: root/spec/models/commit_spec.rb
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <mail@zjvandeweg.nl>2015-11-11 13:07:02 +0100
committerZeger-Jan van de Weg <mail@zjvandeweg.nl>2015-11-11 13:07:02 +0100
commit7e4a7d9ecc02db06c568a0de47e096edbdc1224b (patch)
tree701af1b1789f17950a22a19df4cf8f69d3beb173 /spec/models/commit_spec.rb
parent3f08e4b186bd02b37f34ccf1bc641a95f9d865ce (diff)
parentdfa09789061bbd3891c17ebbcc23f7bd6b95336c (diff)
downloadgitlab-ce-7e4a7d9ecc02db06c568a0de47e096edbdc1224b.tar.gz
Merge branch 'master' into copying-file-seen-as-licence
Diffstat (limited to 'spec/models/commit_spec.rb')
-rw-r--r--spec/models/commit_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/models/commit_spec.rb b/spec/models/commit_spec.rb
index e303a97e6b5..90be9324951 100644
--- a/spec/models/commit_spec.rb
+++ b/spec/models/commit_spec.rb
@@ -89,9 +89,9 @@ eos
end
it_behaves_like 'a mentionable' do
- subject { commit }
+ subject { create(:project).commit }
- let(:author) { create(:user, email: commit.author_email) }
+ let(:author) { create(:user, email: subject.author_email) }
let(:backref_text) { "commit #{subject.id}" }
let(:set_mentionable_text) do
->(txt) { allow(subject).to receive(:safe_message).and_return(txt) }