diff options
| author | Riyad Preukschas <riyad@informatik.uni-bremen.de> | 2012-12-23 01:03:57 +0100 |
|---|---|---|
| committer | Riyad Preukschas <riyad@informatik.uni-bremen.de> | 2012-12-23 01:03:57 +0100 |
| commit | db2c15369c365340aeaf4e431e8838714b40396b (patch) | |
| tree | 26ca045a337132370b67cc8f2ed4010e3087dfa5 /spec/models/note_spec.rb | |
| parent | b47173da6a0fea0982d009f91e2c4d042f9b5c37 (diff) | |
| parent | 68c43d59f09a66cca0da1b9a50c11421d52eac9a (diff) | |
| download | gitlab-ce-db2c15369c365340aeaf4e431e8838714b40396b.tar.gz | |
Merge branch 'master' into discussions
Conflicts:
app/assets/stylesheets/main.scss
app/models/project.rb
app/views/notes/_common_form.html.haml
app/views/notes/_per_line_form.html.haml
lib/gitlab/markdown.rb
spec/models/note_spec.rb
Diffstat (limited to 'spec/models/note_spec.rb')
| -rw-r--r-- | spec/models/note_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb index 4c1afd8a3b4..34683e4196a 100644 --- a/spec/models/note_spec.rb +++ b/spec/models/note_spec.rb @@ -80,13 +80,13 @@ describe Note do let!(:commit) { note.noteable } 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,7 +104,7 @@ describe Note do let!(:commit) { note.noteable } 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 |