Merge branch 'tags_feature'

2014-03-31 14:12:55 +08:00 · 2014-03-31 14:12:55 +08:00 · 455fadec6d
parent 16a656934f 0234b22166
commit 455fadec6d
1 changed files with 1 additions and 1 deletions
--- a/spec/controllers/blogs_controller_spec.rb
+++ b/spec/controllers/blogs_controller_spec.rb
@ -50,7 +50,7 @@ describe BlogsController do
    b = Comment.new(name: '2',content: 'iloveyou',email: 'liuzhen@.com')
    b.post = post
    b.save!
-    label = Label.new(type: '生活')
+    label = Label.new(name: '生活')
    post.labels << label
    post.save!
    get :show, id: post.id