filters reset to page 1. Fixes #445
This commit is contained in:
@@ -30,7 +30,7 @@
|
|||||||
<select class="js-location-changer" name="order-selector">
|
<select class="js-location-changer" name="order-selector">
|
||||||
<% @valid_orders.each do |order| %>
|
<% @valid_orders.each do |order| %>
|
||||||
<option <%= 'selected' if order == @order %>
|
<option <%= 'selected' if order == @order %>
|
||||||
value='<%= current_path_with_query_params(order: order) %>'>
|
value='<%= current_path_with_query_params(order: order, page: 1) %>'>
|
||||||
<%= t("debates.index.orders.#{order}") %>
|
<%= t("debates.index.orders.#{order}") %>
|
||||||
</option>
|
</option>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
<dd class="active"><%= t("#{i18n_namespace}.filters.#{filter}") %></dd>
|
<dd class="active"><%= t("#{i18n_namespace}.filters.#{filter}") %></dd>
|
||||||
<% else %>
|
<% else %>
|
||||||
<dd><%= link_to t("#{i18n_namespace}.filters.#{filter}"),
|
<dd><%= link_to t("#{i18n_namespace}.filters.#{filter}"),
|
||||||
current_path_with_query_params(filter: filter) %></dd>
|
current_path_with_query_params(filter: filter, page: 1) %></dd>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
</dl>
|
</dl>
|
||||||
|
|||||||
@@ -384,6 +384,7 @@ feature 'Debates' do
|
|||||||
end
|
end
|
||||||
|
|
||||||
expect(current_url).to include('order=hot_score')
|
expect(current_url).to include('order=hot_score')
|
||||||
|
expect(current_url).to include('page=1')
|
||||||
end
|
end
|
||||||
|
|
||||||
scenario 'Debates are ordered by most commented', :js do
|
scenario 'Debates are ordered by most commented', :js do
|
||||||
@@ -400,6 +401,7 @@ feature 'Debates' do
|
|||||||
end
|
end
|
||||||
|
|
||||||
expect(current_url).to include('order=most_commented')
|
expect(current_url).to include('order=most_commented')
|
||||||
|
expect(current_url).to include('page=1')
|
||||||
end
|
end
|
||||||
|
|
||||||
scenario 'Debates are ordered by newest', :js do
|
scenario 'Debates are ordered by newest', :js do
|
||||||
@@ -416,6 +418,7 @@ feature 'Debates' do
|
|||||||
end
|
end
|
||||||
|
|
||||||
expect(current_url).to include('order=created_at')
|
expect(current_url).to include('order=created_at')
|
||||||
|
expect(current_url).to include('page=1')
|
||||||
end
|
end
|
||||||
|
|
||||||
scenario 'Debates are ordered randomly', :js do
|
scenario 'Debates are ordered randomly', :js do
|
||||||
@@ -432,6 +435,7 @@ feature 'Debates' do
|
|||||||
debates_second_time = find("#debates.js-order-random").text
|
debates_second_time = find("#debates.js-order-random").text
|
||||||
|
|
||||||
expect(debates_first_time).to_not eq(debates_second_time)
|
expect(debates_first_time).to_not eq(debates_second_time)
|
||||||
|
expect(current_url).to include('page=1')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user