修复随机失败
This commit is contained in:
parent
455fadec6d
commit
75a0039644
|
@ -13,9 +13,8 @@ class BlogsController < ApplicationController
|
|||
|
||||
def show
|
||||
@post = Post.find(params[:id])
|
||||
created_at = Time.at(@post.created_at.to_f)
|
||||
@prev = Post.where(:created_at.lt => created_at).desc(:created_at).first
|
||||
@next = Post.where(:created_at.gt => created_at).asc(:created_at).first
|
||||
@prev = Post.where(:created_at.lt => @post.created_at).desc(:created_at).where(:id.ne => @post.id).first
|
||||
@next = Post.where(:created_at.gt => @post.created_at).asc(:created_at).where(:id.ne => @post.id).first
|
||||
@comments = @post.comments
|
||||
end
|
||||
end
|
||||
|
|
|
@ -73,16 +73,26 @@ describe BlogsController do
|
|||
expect(assigns(:prev)).to eq(s_prev)
|
||||
expect(assigns(:next)).to eq(s_next)
|
||||
|
||||
# 下界
|
||||
selected = posts[0]
|
||||
get :show, id: selected.id
|
||||
expect(assigns(:prev)).to be_nil
|
||||
expect(assigns(:next)).to eq(posts[1])
|
||||
|
||||
# 测试上界
|
||||
selected = posts[2]
|
||||
get :show, id: selected.id
|
||||
expect(assigns(:prev)).to eq(posts[1])
|
||||
expect(assigns(:next)).to be_nil
|
||||
|
||||
# 测试未来时间
|
||||
create(:post, created_at: Time.now + 100)
|
||||
selected = posts[1]
|
||||
get :show, id: selected.id
|
||||
expect(assigns(:prev)).to eq(posts[0])
|
||||
expect(assigns(:next)).to eq(posts[2])
|
||||
|
||||
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -15,7 +15,7 @@ RSpec.configure do |config|
|
|||
DatabaseCleaner.start
|
||||
end
|
||||
|
||||
config.after do
|
||||
config.after :each do
|
||||
DatabaseCleaner.clean
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in New Issue