<%= user_avatar_tag(reply.user, :normal) %>
-
<%= user_name_tag(reply.user) %>
-
+
+ <%= user_name_tag(reply.user) %>
<%= reply_counter + 1 %><%= t("common.floor")%>, <%= raw t("common.reply_at", :time => timeago(reply.created_at)) %>
+
+
+ <%= likeable_tag(reply) %>
<% if can?(:update,reply) %>
<%= link_to("", edit_topic_reply_path(@topic,reply), :class => "edit icon small_edit", 'data-uid' => reply.user_id, :title => "修改回帖")%>
<% end %>
@@ -17,5 +20,7 @@
<%= raw reply.body_html %>
+
+
diff --git a/db/migrate/20120422061501_reply_mention_to_mentionable.rb b/db/migrate/20120422061501_reply_mention_to_mentionable.rb
deleted file mode 100644
index 1f122f21c9..0000000000
--- a/db/migrate/20120422061501_reply_mention_to_mentionable.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-class ReplyMentionToMentionable < Mongoid::Migration
- def self.up
- Notification::Mention.where(:reply_id.ne => nil).each do |mention|
- mention[:mentionable_id] = mention["reply_id"]
- mention[:mentionable_type] = 'Reply'
- mention.save
- mention.unset :reply_id
- end
- end
-
- def self.down
- Notification::Mention.where(:reply_id => nil).each do |mention|
- mention["reply_id"] = mention["mentionable_id"]
- mention.save
- mention.unset :mentionable_id
- mention.unset :mentionable_type
- end
- end
-end
diff --git a/db/migrate/20120513024148_remove_old_topic_followers.rb b/db/migrate/20120513024148_remove_old_topic_followers.rb
deleted file mode 100644
index de9f5a75d9..0000000000
--- a/db/migrate/20120513024148_remove_old_topic_followers.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class RemoveOldTopicFollowers < Mongoid::Migration
- def self.up
- Topic.unscoped.all.each do |topic|
- topic.unset(:follower_ids)
- end
- end
-end
\ No newline at end of file
diff --git a/spec/helpers/likes_helper_spec.rb b/spec/helpers/likes_helper_spec.rb
index a0962b6cce..6f722e7a9b 100644
--- a/spec/helpers/likes_helper_spec.rb
+++ b/spec/helpers/likes_helper_spec.rb
@@ -14,12 +14,14 @@
it "should result when logined user liked" do
helper.stub(:current_user).and_return(user)
topic.stub(:liked_by_user?).and_return(true)
+ helper.likeable_tag(topic).should == %(
喜欢)
+ topic.stub!(:likes_count).and_return(3)
helper.likeable_tag(topic).should == %(
#{topic.likes_count}人喜欢)
end
it "should result when unlogin user" do
helper.stub(:current_user).and_return(nil)
- helper.likeable_tag(topic).should == %(
#{topic.likes_count}人喜欢)
+ helper.likeable_tag(topic).should == %(
喜欢)
end
end
end
diff --git a/spec/models/like_spec.rb b/spec/models/like_spec.rb
deleted file mode 100644
index 037376f9e3..0000000000
--- a/spec/models/like_spec.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-require 'spec_helper'
-
-describe Like do
- let(:topic) { Factory :topic }
- let(:user) { Factory :user }
- let(:user2) { Factory :user }
-
- describe "like topic" do
- after do
- Like.delete_all
- end
-
- it "can like/unlike topic" do
- user.like(topic)
- user.likes.count.should == 1
- user.reload
- user.likes_count.should == 1
- topic.reload
- topic.likes_count.should == 1
- user2.like(topic)
- topic.reload
- topic.likes_count.should == 2
- user2.unlike(topic)
- topic.reload
- user2.likes.count.should == 0
- user2.reload
- user2.likes_count.should == 0
- topic.likes_count.should == 1
- end
-
- it "can tell whether or not liked by a user" do
- topic.liked_by_user?(user).should be_false
- user.like(topic)
- topic.liked_by_user?(user).should be_true
- end
- end
-end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index d09cfbf84a..d7992007f7 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -39,7 +39,7 @@
user_for_delete1.authorizations.should == []
end
end
-
+
describe "location" do
it "should not get results when user location not set" do
Location.count == 0
@@ -50,7 +50,7 @@
user2.location = "Hongkong"
Location.count == 2
end
-
+
it "should update users_count when user location changed" do
old_name = user.location
new_name = "HongKong"
@@ -141,17 +141,17 @@
user.private_token.should_not == old_token
end
end
-
+
describe "favorite topic" do
it "should favorite a topic" do
user.favorite_topic(topic.id)
user.favorite_topic_ids.include?(topic.id).should == true
-
+
user.favorite_topic(nil).should == false
user.favorite_topic(topic.id.to_s).should == false
user.favorite_topic_ids.include?(topic.id).should == true
end
-
+
it "should unfavorite a topic" do
user.unfavorite_topic(topic.id)
user.favorite_topic_ids.include?(topic.id).should == false
@@ -159,4 +159,35 @@
user.unfavorite_topic(topic.id.to_s).should == true
end
end
+
+ describe "Like" do
+ let(:topic) { Factory :topic }
+ let(:user) { Factory :user }
+ let(:user2) { Factory :user }
+
+ describe "like topic" do
+ it "can like/unlike topic" do
+ user.like(topic)
+ topic.reload
+ topic.likes_count.should == 1
+ topic.liked_user_ids.should include(user.id)
+
+ user2.like(topic)
+ topic.reload
+ topic.likes_count.should == 2
+ topic.liked_user_ids.should include(user2.id)
+
+ user2.unlike(topic)
+ topic.reload
+ topic.likes_count.should == 1
+ topic.liked_user_ids.should_not include(user2.id)
+ end
+
+ it "can tell whether or not liked by a user" do
+ topic.liked_by_user?(user).should be_false
+ user.like(topic)
+ topic.liked_by_user?(user).should be_true
+ end
+ end
+ end
end