summaryrefslogtreecommitdiff
path: root/spec/models/commit_range_spec.rb
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-06-06 18:58:24 +0300
committerFatih Acet <acetfatih@gmail.com>2016-06-06 18:58:24 +0300
commit3f2db9d971dd92b446e2a615ed758090079a8c64 (patch)
treec3034fc5bde8c3d0d2516de01e67d44c0c796fa1 /spec/models/commit_range_spec.rb
parent5b43eeee97f8e06a4ada4b173cb972c20d58d8ed (diff)
parentac4e3e8cf016f2c2b3dcf3997673310a5df658a9 (diff)
downloadgitlab-ce-button-focus-state.tar.gz
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into button-focus-statebutton-focus-state
Diffstat (limited to 'spec/models/commit_range_spec.rb')
-rw-r--r--spec/models/commit_range_spec.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/spec/models/commit_range_spec.rb b/spec/models/commit_range_spec.rb
index 6bc496414a3..384a38ebc69 100644
--- a/spec/models/commit_range_spec.rb
+++ b/spec/models/commit_range_spec.rb
@@ -151,9 +151,10 @@ describe CommitRange, models: true do
issue = create(:issue)
create(:note_on_issue,
- noteable_id: issue.id,
+ noteable: issue,
system: true,
- note: commit1.revert_description)
+ note: commit1.revert_description,
+ project: issue.project)
expect_any_instance_of(Commit).to receive(:reverts_commit?).
with(commit1).