From 1f28e97c2e5929a85150dddcfe018fc16ceb88ad Mon Sep 17 00:00:00 2001
From: kikito <kikito@gmail.com>
Date: Fri, 11 Sep 2015 13:04:43 +0200
Subject: [PATCH] filters reset to page 1. Fixes #445

---
 app/views/debates/index.html.erb         | 2 +-
 app/views/shared/_filter_subnav.html.erb | 2 +-
 spec/features/debates_spec.rb            | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/views/debates/index.html.erb b/app/views/debates/index.html.erb
index f0db765d2..c0c78ade4 100644
--- a/app/views/debates/index.html.erb
+++ b/app/views/debates/index.html.erb
@@ -30,7 +30,7 @@
              <select class="js-location-changer" name="order-selector">
                <% @valid_orders.each do |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}") %>
                  </option>
                <% end %>
diff --git a/app/views/shared/_filter_subnav.html.erb b/app/views/shared/_filter_subnav.html.erb
index 0f8975aa3..0bf9f773c 100644
--- a/app/views/shared/_filter_subnav.html.erb
+++ b/app/views/shared/_filter_subnav.html.erb
@@ -11,7 +11,7 @@
       <dd class="active"><%= t("#{i18n_namespace}.filters.#{filter}") %></dd>
     <% else %>
       <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 %>
 </dl>
diff --git a/spec/features/debates_spec.rb b/spec/features/debates_spec.rb
index bcddab7a4..301e9113d 100644
--- a/spec/features/debates_spec.rb
+++ b/spec/features/debates_spec.rb
@@ -384,6 +384,7 @@ feature 'Debates' do
       end
 
       expect(current_url).to include('order=hot_score')
+      expect(current_url).to include('page=1')
     end
 
     scenario 'Debates are ordered by most commented', :js do
@@ -400,6 +401,7 @@ feature 'Debates' do
       end
 
       expect(current_url).to include('order=most_commented')
+      expect(current_url).to include('page=1')
     end
 
     scenario 'Debates are ordered by newest', :js do
@@ -416,6 +418,7 @@ feature 'Debates' do
       end
 
       expect(current_url).to include('order=created_at')
+      expect(current_url).to include('page=1')
     end
 
     scenario 'Debates are ordered randomly', :js do
@@ -432,6 +435,7 @@ feature 'Debates' do
       debates_second_time = find("#debates.js-order-random").text
 
       expect(debates_first_time).to_not eq(debates_second_time)
+      expect(current_url).to include('page=1')
     end
   end