summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-12-24 20:34:13 +0100
committerDouwe Maan <douwe@gitlab.com>2015-12-24 20:34:13 +0100
commit396c5c97ddbbe0744d9c27d855c22e2a57546ea1 (patch)
treeade792336266aefdb926deb63d8a9ab6afe4e18e
parent672cbbff959c66ba10740ed17671d93060410d93 (diff)
downloadgitlab-ce-396c5c97ddbbe0744d9c27d855c22e2a57546ea1.tar.gz
Fix specs
-rw-r--r--spec/models/concerns/mentionable_spec.rb4
-rw-r--r--spec/services/notification_service_spec.rb1
2 files changed, 5 insertions, 0 deletions
diff --git a/spec/models/concerns/mentionable_spec.rb b/spec/models/concerns/mentionable_spec.rb
index 6653621a83e..20f0c561e44 100644
--- a/spec/models/concerns/mentionable_spec.rb
+++ b/spec/models/concerns/mentionable_spec.rb
@@ -3,6 +3,10 @@ require 'spec_helper'
describe Mentionable do
include Mentionable
+ def author
+ nil
+ end
+
describe :references do
let(:project) { create(:project) }
diff --git a/spec/services/notification_service_spec.rb b/spec/services/notification_service_spec.rb
index d7a898e85ff..213adace14b 100644
--- a/spec/services/notification_service_spec.rb
+++ b/spec/services/notification_service_spec.rb
@@ -115,6 +115,7 @@ describe NotificationService, services: true do
before do
build_team(note.project)
+ note.project.team << [note.author, :master]
ActionMailer::Base.deliveries.clear
end