Rename by_user to newest_by_user and sort accordingly.
This commit is contained in:
parent
bdbfedfb23
commit
2ffe322f64
|
@ -86,7 +86,7 @@ class HomeController < ApplicationController
|
||||||
by_user = User.where(:username => params[:user]).first!
|
by_user = User.where(:username => params[:user]).first!
|
||||||
|
|
||||||
@stories, @show_more = get_from_cache(by_user: by_user) {
|
@stories, @show_more = get_from_cache(by_user: by_user) {
|
||||||
paginate stories.by_user(by_user)
|
paginate stories.newest_by_user(by_user)
|
||||||
}
|
}
|
||||||
|
|
||||||
@heading = @title = "Newest Stories by #{by_user.username}"
|
@heading = @title = "Newest Stories by #{by_user.username}"
|
||||||
|
|
|
@ -31,8 +31,8 @@ class StoryRepository
|
||||||
newest.order("stories.created_at DESC")
|
newest.order("stories.created_at DESC")
|
||||||
end
|
end
|
||||||
|
|
||||||
def by_user(user)
|
def newest_by_user(user)
|
||||||
base_scope.where(user_id: user.id)
|
base_scope.where(user_id: user.id).order("stories.id DESC")
|
||||||
end
|
end
|
||||||
|
|
||||||
def recent
|
def recent
|
||||||
|
|
|
@ -70,7 +70,7 @@ describe HomeController do
|
||||||
let(:scope) { double 'Newest By User Scope' }
|
let(:scope) { double 'Newest By User Scope' }
|
||||||
let(:user) { User.make! }
|
let(:user) { User.make! }
|
||||||
|
|
||||||
before { StoryRepository.any_instance.should_receive(:by_user).with(user) }
|
before { StoryRepository.any_instance.should_receive(:newest_by_user).with(user) }
|
||||||
before { get 'newest_by_user', user: user.username }
|
before { get 'newest_by_user', user: user.username }
|
||||||
|
|
||||||
context 'assigns' do
|
context 'assigns' do
|
||||||
|
|
|
@ -87,17 +87,17 @@ describe StoryRepository do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe '#by_user' do
|
describe '#newest_by_user' do
|
||||||
let(:another_user) { User.make! }
|
let(:another_user) { User.make! }
|
||||||
|
|
||||||
subject { stories.by_user(another_user) }
|
subject { stories.newest_by_user(another_user) }
|
||||||
|
|
||||||
it 'orders by created_at' do
|
it 'orders by id descending' do
|
||||||
story1 = Story.make! user_id: another_user.id
|
story1 = Story.make! user_id: another_user.id
|
||||||
story2 = Story.make!
|
story2 = Story.make!
|
||||||
story3 = Story.make! user_id: another_user.id
|
story3 = Story.make! user_id: another_user.id
|
||||||
|
|
||||||
expect(subject).to eq [story1, story3]
|
expect(subject).to eq [story3, story1]
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue