2 files changed, 6 insertions, 6 deletions
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index d70647f668d..a0849401254 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -42,7 +42,7 @@ describe MergeRequest do
 
     before do
       merge_request.stub(:commits) { [merge_request.project.commit] }
-      create(:note, noteable: merge_request.commits.first)
+      create(:note, commit_id: merge_request.commits.first.id, noteable_type: 'Commit')
       create(:note, noteable: merge_request)
     end
 
diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb
index 4f9352b9a14..61aaf6455eb 100644
--- a/spec/models/note_spec.rb
+++ b/spec/models/note_spec.rb
@@ -81,18 +81,18 @@ describe Note do
   describe "Commit notes" do
     before do
       @note = create(:note,
-                     noteable_id: commit.id,
+                     commit_id: commit.id,
                      noteable_type: "Commit")
     end
 
     it "should be accessible through #noteable" do
-      @note.noteable_id.should == commit.id
+      @note.commit_id.should == commit.id
       @note.noteable.should be_a(Commit)
       @note.noteable.should == commit
     end
 
     it "should save a valid note" do
-      @note.noteable_id.should == commit.id
+      @note.commit_id.should == commit.id
       @note.noteable == commit
     end
 
@@ -104,13 +104,13 @@ describe Note do
   describe "Pre-line commit notes" do
     before do
       @note = create(:note,
-                     noteable_id: commit.id,
+                     commit_id: commit.id,
                      noteable_type: "Commit",
                      line_code: "0_16_1")
     end
 
     it "should save a valid note" do
-      @note.noteable_id.should == commit.id
+      @note.commit_id.should == commit.id
       @note.noteable.id.should == commit.id
     end