deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Split commit_id and noteable_id for Note

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-12-18 20:02:00 +02:00
parent aa8d4d9fea
commit 9ada678819
11 changed files with 54 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
spec/models/merge_request_spec.rb
View file

@ -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

10
spec/models/note_spec.rb
View file

@ -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