Rework routes

lib/sidekiq/expected_failures/web.rb

@@ -24,7 +24,7 @@ def link_to_details(job)
           json(failures: Sidekiq::ExpectedFailures.counters)
         end
 
-        app.get "/expected_failures" do
+        panel = proc do
           @dates = Sidekiq::ExpectedFailures.dates
           @count = (params[:count] || 50).to_i
 
@@ -41,6 +41,14 @@ def link_to_details(job)
 
           erb File.read(File.join(web_dir, "views/expected_failures.erb"))
         end
+
+        app.get "/expected_failures/day/:date" do
+          self.instance_exec(&panel)
+        end
+
+        app.get "/expected_failures" do
+          self.instance_exec(&panel)
+        end
       end
     end
   end

test/lib/web_test.rb

@@ -42,7 +42,7 @@ def create_sample_failure
 
     after { Timecop.return }
 
-    it 'can display home with expected failures llink' do
+    it 'can display home with expected failures link' do
       get '/'
       last_response.status.must_equal(200)
       last_response.body.must_include('<a href="/expected_failures">Expected Failures</a>')
@@ -161,5 +161,21 @@ def create_sample_failure
         end
       end
     end
+
+    describe 'pagination & filtering' do
+      before do
+        51.times { create_sample_failure }
+      end
+
+      it 'displays pagination widget when needed' do
+        get '/expected_failures'
+        last_response.body.must_include('<ul class="pagination')
+      end
+
+      it 'properly links to next page' do
+        get '/expected_failures/day/2013-09-10'
+        last_response.body.must_include('/expected_failures/day/2013-09-10?page=2')
+      end
+    end
   end
 end

web/assets/expected.js

@@ -15,7 +15,11 @@
     e.preventDefault();
   });
 
-  $('#filter-jobs select, #clear-jobs select').live('change', function(e){
+  $('#clear-jobs select').live('change', function(e){
     $(this).parent('form').submit();
   });
+
+  $('#filter-jobs select').live('change', function(e){
+    location.href = $(this).val();
+  });
  });

web/views/expected_failures.erb

@@ -77,14 +77,14 @@
     <label>Choose date:</label>
     <select name="date">
       <% @dates.each do |date, count| %>
-        <option value="<%= date %>" <%= "selected" if date == @date %>><%= date %> (<%= count %>)</option>
+        <option value="<%= "#{root_path}expected_failures/day/#{date}" %>" <%= "selected" if date == @date %>><%= date %> (<%= count %>)</option>
       <% end %>
     </select>
   </form>
 
   <p class="clearfix"></p>
 
-  <%= erb :_paging, locals: { url: "#{root_path}expected_failures?date=#{@date}" } %>
+  <%= erb :_paging, locals: { url: "#{root_path}expected_failures/day/#{@date}" } %>
 
   <table id="expected" class="queues table table-hover table-bordered table-striped table-white">
     <thead>
@@ -105,7 +105,7 @@
     <% end %>
   </table>
 
-  <%= erb :_paging, locals: { url: "#{root_path}expected_failures/#{@date}" } %>
+  <%= erb :_paging, locals: { url: "#{root_path}expected_failures/day/#{@date}" } %>
 
 <% else %>
   <p class="clearfix"></p>