resque-scheduler-web 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cdaf732772b3cf1c129b8394190a3e3e2d991d01
-  data.tar.gz: 932897408224f2238e1a5323c415fc26f08164b4
+  metadata.gz: 0e0d9ae424811136f0f35b1c596f174b5e452d56
+  data.tar.gz: 558a1cc70f5fb9262acc90eae0977f6e15917f88
 SHA512:
-  metadata.gz: 9c9d83155665494ef45db59edb1ae4e61b3017ca46a17620f4ba748ec577d5c2088f944de2b3154dd27a60fc73d79a18ea6abfbbd1b3101f06a935b201b4ea6d
-  data.tar.gz: 2cda060442328d84b6ffe8b01687bc665811e69ff0713fadf295160e889a3bd1913ecc089696828ff3778f2804b4ce3d2a8db63b10245990169c07ecb0243531
+  metadata.gz: 4a179c41dd6f5c3a9f8366e00adf05956006adcf0b1d9be60587b61607bf4c9da9deb435362d0903fb1ebf52c976003799b8b07f4ddd9ec9cc14ba523ce8ed80
+  data.tar.gz: 1a064fb3d53f6a127e95001a2284f165920a627b8b9d2d91ce69366afaa8030a252b8060e5d14e8f7b32eef300b99af7f8703f839c9a407dcf65c2ed10904fe1

data/CHANGELOG.md

@@ -0,0 +1,27 @@
+# Changelog
+
+## 0.0.4
+* More Rspec feature specs. All main functionality is now covered with 
+integration tests.
+* Timestamps page for a job now correctly shows timestamps for jobs which
+inherit from `ActiveJob::Base`.
+* Timestamps page for a job shows timestamps as links.
+* Some layout and styling improvements.
+
+## 0.0.3
+* Fixed timestamps page.
+* Added Rspec features to cover more functionality that was previously untested.
+
+## 0.0.2
+* Add documentation for methods and classes.
+* Clean up lots of Rubocop issues with the code style.
+* Set up Travis CI.
+* Add various badges to the README.
+* Add runtime dependencies to prevent a bug with earlier versions of 
+resque-scheduler, which defined `Resque::Scheduler` as a class, rather than a 
+module.
+
+## 0.0.1
+* Code ported over from the main resque-scheduler gem, extracted from the 
+Sinatra interface, and put into a rails engine.
+* Test suite converted to use Rspec.

data/app/controllers/resque_web/plugins/resque_scheduler/delayed_controller.rb

@@ -14,13 +14,32 @@ module ResqueWeb
         end
 
         # GET /delayed/jobs/:klass
-        # Shows us all of the jobs of this type, with these args. Accessed by
+        # Shows us all of the timestamps where jobs of this type, with these
+        # args are currently scheduled as delayed jobs. Accessed by
         # clicking the 'All schedules' link next to a delayed job.
         def jobs_klass
           klass = Resque::Scheduler::Util.constantize(params[:klass])
-          @args = JSON.load(URI.decode(params[:args]))
-          @timestamps = Resque.scheduled_at(klass, *@args)
+          @args = params[:args] ? JSON.load(URI.decode(params[:args])) : []
+
+          # ActiveJob hack. The wrapper class does not know what queue the
+          # wrapped class wants to use, so we need to tell Resque Scheduler
+          # the queue, rather than have it use Resque's internal guessing
+          # mechanism.
+          if klass.to_s == 'ActiveJob::QueueAdapters::ResqueAdapter::JobWrapper'
+            queue_name = @args.first['queue_name']
+            hashed_job = Resque.send :job_to_hash_with_queue, queue_name, klass, @args
+            search = Resque.send :encode, hashed_job
+            @timestamps = Resque.instance_eval do
+              redis.smembers("timestamps:#{search}").map do |key|
+                key.tr('delayed:', '').to_i
+              end
+            end
+          else
+            @timestamps = Resque.scheduled_at(klass, *@args)
+          end
         rescue
+          # Should this be a rescue? Seems to cover the case of the params
+          # not validating or something.
           @timestamps = []
         end
 
@@ -30,6 +49,7 @@ module ResqueWeb
         end
 
         # POST /delayed/cancel_now
+        # cancels a specific job based on klass, timestamp and args.
         def cancel_now
           klass = Resque::Scheduler::Util.constantize(params['klass'])
           timestamp = params['timestamp']
@@ -45,6 +65,8 @@ module ResqueWeb
         end
 
         # POST /delayed/queue_now
+        # Sends ALL of the delayed jobs at a particular timestamp to the queue,
+        # regardless of their details.
         def queue_now
           timestamp = params['timestamp'].to_i
           if timestamp > 0

data/app/views/resque_web/plugins/resque_scheduler/delayed/_search_form.erb

@@ -1,6 +1,6 @@
 <form method="POST" action="<%= delayed_search_path %>">
   <input type='input' name='search' value="<%= params[:search] %>"/>
-  <input type='submit' value='Search'/>
+  <input type='submit' value='Search' class="btn btn-default"/>
 </form>
 
 

data/app/views/resque_web/plugins/resque_scheduler/delayed/index.erb

@@ -7,53 +7,58 @@
   Server local time: <%= Time.now %>
 </p>
 
-<p class='sub'>
-  <% finish = [@start + @number_to_show, @total_number_of_delayed_jobs].min %>
-  Showing <%= @start %> to <%= finish %> of
-  <b><%= @total_number_of_delayed_jobs %></b> timestamps
-</p>
+<% if @timestamps.any? %>
+
+  <p class='sub'>
+    <% finish = [@start + @number_to_show, @total_number_of_delayed_jobs].min %>
+    Showing <%= @start %> to <%= finish %> of
+    <b><%= @total_number_of_delayed_jobs %></b> timestamps
+  </p>
 
-<table class="table table-bordered">
-  <tr>
-    <th></th>
-    <th>Timestamp</th>
-    <th>Job count</th>
-    <th>Class</th>
-    <th>Args</th>
-    <th>All schedules</th>
-  </tr>
-  <% @timestamps.each do |timestamp| %>
-    <tr class="delayed-job">
-      <td>
-        <form action="<%= queue_now_path %>" method="post">
-          <input type="hidden" name="timestamp" value="<%= timestamp.to_i %>">
-          <input type="submit" value="Queue now" class="btn btn-default">
-        </form>
-      </td>
-      <td><a href="<%= delayed_path timestamp: timestamp %>"><%= format_time(Time.at(timestamp)) %></a></td>
-      <td class="job-count"><%= delayed_timestamp_size = Resque.delayed_timestamp_size(timestamp) %></td>
-      <% job = Resque.delayed_timestamp_peek(timestamp, 0, 1).first %>
-      <td>
-        <% if job && delayed_timestamp_size == 1 %>
-          <%= h(job['class']) %>
-        <% else %>
-          <a href="<%= timestamp_path timestamp: timestamp %>">see details</a>
-        <% end %>
-      </td>
-      <td><%= h(job['args'].inspect) if job && delayed_timestamp_size == 1 %></td>
-      <td>
-        <% if job %>
-          <a href="<%= delayed_job_class_path klass: job['class'], args: URI.encode(job['args'].to_json) %>">All schedules</a>
-        <% end %>
-      </td>
+  <table class="table table-bordered">
+    <tr>
+      <th></th>
+      <th>Timestamp</th>
+      <th>Job count</th>
+      <th>Class</th>
+      <th>Args</th>
+      <th>All schedules</th>
     </tr>
-  <% end %>
-</table>
+    <% @timestamps.each do |timestamp| %>
+      <tr class="delayed-job">
+        <td>
+          <form action="<%= queue_now_path %>" method="post">
+            <input type="hidden" name="timestamp" value="<%= timestamp.to_i %>">
+            <input type="submit" value="Queue now" class="btn btn-default">
+          </form>
+        </td>
+        <td class="timestamp-link"><a href="<%= timestamp_path timestamp: timestamp %>"><%= format_time(Time.at(timestamp)) %></a></td>
+        <td class="job-count"><%= delayed_timestamp_size = Resque.delayed_timestamp_size(timestamp) %></td>
+        <% job = Resque.delayed_timestamp_peek(timestamp, 0, 1).first %>
+        <td>
+          <% if job && delayed_timestamp_size == 1 %>
+            <%= h(job['class']) %>
+          <% else %>
+            <a href="<%= timestamp_path timestamp: timestamp %>">see details</a>
+          <% end %>
+        </td>
+        <td><%= h(job['args'].inspect) if job && delayed_timestamp_size == 1 %></td>
+        <td>
+          <% if job %>
+            <a href="<%= delayed_job_class_path klass: job['class'], args: URI.encode(job['args'].to_json) %>">All schedules</a>
+          <% end %>
+        </td>
+      </tr>
+    <% end %>
+  </table>
+<% else %>
+  <h2>There are no delayed jobs</h2>
+<% end %>
 
 <% if @total_number_of_delayed_jobs > 0 %>
   <br>
   <form method="POST" action="<%= clear_path %>" class='clear-delayed'>
-    <input type='submit' name='' value='Clear Delayed Jobs' />
+    <input type='submit' name='' value='Clear All Delayed Jobs' class="btn btn-default"/>
   </form>
 <% end %>
 

data/app/views/resque_web/plugins/resque_scheduler/delayed/jobs_klass.erb

@@ -1,14 +1,15 @@
-<h1>Delayed jobs scheduled for <%= params[:klass] %> (<%= @args %>)</h1>
+<h1>Timestamps where delayed jobs are scheduled for class:<br> <%= params[:klass] %></h1>
+<h2>With params: <%= @args %></h2>
 
-<table class='jobs'>
+<table class='jobs table table-bordered'>
   <tr>
-    <th>Timestamp</th>
+    <th><%= "Timestamp".pluralize(@timestamps.size) %></th>
   </tr>
 
   <% @timestamps.each do |t| %>
     <tr>
       <td>
-        <%= Time.at(t) %>
+        <%= link_to Time.at(t), timestamp_path(timestamp: t.to_i), class: 'timestamp-link' %>
       </td>
     </tr>
   <% end %>

data/app/views/resque_web/plugins/resque_scheduler/delayed/search.erb

@@ -24,7 +24,7 @@
             <input type="hidden" name="timestamp" value="<%= job['timestamp'].to_i %>">
             <input type="hidden" name="klass" value="<%= job['class'] %>">
             <input type="hidden" name="args" value="<%= Resque.encode job['args'] %>">
-            <input type="submit" value="Cancel Job">
+            <input type="submit" value="Cancel Job" class="btn btn-default">
           </form>
         </td>
         <td class='args'><%= format_time(Time.at(job['timestamp'])) %></td>

data/lib/resque/scheduler/web/version.rb

@@ -1,7 +1,7 @@
 module Resque
   module Scheduler
     module Web
-      VERSION = '0.0.3'
+      VERSION = '0.0.4'
     end
   end
 end

data/spec/dummy/config/application.rb

@@ -28,5 +28,7 @@ module Dummy
 
     # Do not swallow errors in after_commit/after_rollback callbacks.
     config.active_record.raise_in_transactional_callbacks = true
+
+    config.active_job.queue_adapter = :resque
   end
 end

data/spec/features/delayed/cancel_delayed_job_spec.rb

@@ -0,0 +1,28 @@
+require 'rails_helper'
+
+feature 'cancelling a delayed job' do
+
+  include SharedFunctionsForFeatures
+
+  scenario 'cancelling the job from the search page' do
+    given_there_is_a_delayed_job
+    when_i_search_for_the_delayed_job
+    and_i_cancel_the_job
+    then_i_should_be_on_the_delayed_jobs_page
+    and_the_job_should_not_be_present_on_the_page
+  end
+
+  def and_i_cancel_the_job
+    click_button 'Cancel'
+  end
+
+  def when_i_search_for_the_delayed_job
+    visit resque_scheduler_engine_routes.delayed_path
+    fill_in 'search', with: 'some'
+    click_button 'Search'
+  end
+
+  def and_the_job_should_not_be_present_on_the_page
+    expect(page).to_not have_content 'SomeIvarJob'
+  end
+end

data/spec/features/delayed/clear_all_jobs_spec.rb

@@ -0,0 +1,24 @@
+require 'rails_helper'
+
+feature 'clearing all of the delayed jobs' do
+
+  include SharedFunctionsForFeatures
+
+  scenario 'clearing the jobs from the delayed index' do
+    given_there_are_two_delayed_jobs_enqueued_at_different_times
+    when_i_visit_the_delayed_jobs_page
+    and_i_click_the_clear_all_jobs_button
+    then_i_should_be_on_the_delayed_jobs_page
+    and_i_should_not_see_any_jobs_on_the_page
+  end
+
+  def and_i_should_not_see_any_jobs_on_the_page
+    expect(page).to_not have_content 'SomeIvarJob'
+    expect(page).to_not have_content 'JobWithoutParams'
+  end
+
+  def and_i_click_the_clear_all_jobs_button
+    click_button 'Clear All Delayed Jobs'
+  end
+
+end

data/spec/features/delayed/delayed_jobs_index_page_spec.rb

@@ -2,23 +2,18 @@ require 'rails_helper'
 
 feature 'seeing all the delayed jobs on the index page' do
 
-  after do
-    reset_the_resque_schedule
-  end
-
-  let(:some_time_in_the_future) { Time.now + 3600 }
-  let(:some_other_time_in_the_future) { Time.now + 4600 }
+  include SharedFunctionsForFeatures
 
-  # Given there is a delayed job
-  # And another delayed job enqueued at a later time
-  # When I visit the delayed jobs index page
-  # Then I should see the job on the page
   scenario 'delayed jobs show up on the page when at different times' do
-    Resque.enqueue_at(some_time_in_the_future, SomeIvarJob)
-    Resque.enqueue_at(some_other_time_in_the_future, JobWithoutParams)
-    visit resque_scheduler_engine_routes.delayed_path
+    given_there_are_two_delayed_jobs_enqueued_at_different_times
+    when_i_visit_the_delayed_jobs_page
+    then_i_should_see_the_details_of_both_jobs_on_the_page
+  end
+
+  def then_i_should_see_the_details_of_both_jobs_on_the_page
     expect(page).to have_content 'SomeIvarJob'
     expect(page).to have_content 'JobWithoutParams'
+    expect(page).to have_content some_time_in_the_future
+    expect(page).to have_content some_other_time_in_the_future
   end
-
-end
+end

data/spec/features/delayed/delayed_jobs_timestamp_page_spec.rb

@@ -2,28 +2,55 @@ require 'rails_helper'
 
 feature 'seeing a summary of the delayed jobs for a timestamp on the index' do
 
-  after do
-    reset_the_resque_schedule
+  include SharedFunctionsForFeatures
+
+  scenario 'delayed jobs show up on the page when at the same times' do
+    given_there_are_two_delayed_jobs_enqueued_at_the_same_time
+    when_i_visit_the_delayed_jobs_page
+    then_i_should_see_the_delayed_jobs_on_the_page_as_summary
+    when_i_click_through_to_the_details_page
+    then_i_should_see_the_details_of_the_jobs
   end
 
-  let(:some_time_in_the_future) { Time.now + 3600 }
-  let(:some_other_time_in_the_future) { Time.now + 4600 }
+  scenario 'jobs on the delayed page all have a link to their timestamp page' do
+    given_there_is_a_delayed_job
+    when_i_visit_the_delayed_jobs_page
+    when_i_click_on_the_timestamp_next_to_the_job
+    then_i_should_be_on_the_timestamps_page
+  end
 
-  # Given there is a delayed job
-  # And another delayed job enqueued at the same time
-  # When I visit the delayed jobs index page
-  # Then I should see the jobs on the page as a summary
-  # When I click through to the details page
-  # Then I should see the details of the jobs
-  scenario 'delayed jobs show up on the page when at the same times' do
-    Resque.enqueue_at(some_time_in_the_future, JobWithParams, { argument: 'thingy' })
+  def then_i_should_be_on_the_timestamps_page
+    expected_path = resque_scheduler_engine_routes.timestamp_path(
+      timestamp: some_time_in_the_future.to_i
+    )
+    expect(current_path).to eq expected_path
+  end
+
+  def when_i_click_on_the_timestamp_next_to_the_job
+    all('.timestamp-link a').first.click
+  end
+
+  def given_there_are_two_delayed_jobs_enqueued_at_the_same_time
+    Resque.enqueue_at(some_time_in_the_future, JobWithParams, argument: 'thingy')
     Resque.enqueue_at(some_time_in_the_future, JobWithoutParams)
+  end
+
+  def when_i_visit_the_delayed_jobs_page
     visit resque_scheduler_engine_routes.delayed_path
+  end
+
+  def then_i_should_see_the_delayed_jobs_on_the_page_as_summary
     expect(page).to have_css '.job-count', text: '2'
+  end
+
+  def when_i_click_through_to_the_details_page
     click_link 'see details'
+  end
+
+  def then_i_should_see_the_details_of_the_jobs
     expect(page).to have_content 'JobWithParams'
     expect(page).to have_content '"argument"=>"thingy"'
     expect(page).to have_content 'JobWithoutParams'
+    expect(page).to have_content some_time_in_the_future
   end
-
 end

data/spec/features/delayed/see_all_timestamps_for_a_class_spec.rb

@@ -0,0 +1,55 @@
+require 'rails_helper'
+
+feature 'seeing all of the timestamps where a class is delayed' do
+
+  include SharedFunctionsForFeatures
+
+  scenario 'viewing the timestamps page with no params' do
+    given_there_is_a_delayed_job
+    when_i_visit_the_delayed_jobs_page
+    and_i_click_on_the_link_to_see_all_the_timestamps_for_that_job
+    then_i_should_be_on_the_delayed_class_page
+    and_i_should_see_the_timestamp_on_the_page
+  end
+
+  scenario 'viewing the timestamps page with activejob' do
+    given_there_is_a_delayed_job_with_active_job
+    when_i_visit_the_delayed_jobs_page
+    and_i_click_on_the_link_to_see_all_the_timestamps_for_that_job
+    and_i_should_see_the_timestamp_on_the_page
+    when_i_click_on_the_timestap
+    then_i_should_be_on_the_timestamp_page
+  end
+
+  def and_i_click_on_the_link_to_see_all_the_timestamps_for_that_job
+    click_link 'All schedules'
+  end
+
+  def then_i_should_be_on_the_delayed_class_page
+    expect(current_path).to eq resque_scheduler_engine_routes.delayed_job_class_path klass: 'SomeIvarJob'
+  end
+
+  def then_i_should_be_on_the_delayed_class_page_with_params
+    expect(current_path).to eq resque_scheduler_engine_routes.delayed_job_class_path klass: 'JobWithParams'
+  end
+
+  def and_i_should_see_the_timestamp_on_the_page
+    expect(page).to have_content some_time_in_the_future
+  end
+
+  def given_there_is_a_delayed_job_with_params
+    Resque.enqueue_at(some_time_in_the_future, JobWithParams, argument: 'thingy')
+  end
+
+  def given_there_is_a_delayed_job_with_active_job
+    ActiveJobTest.set(wait_until: some_time_in_the_future).perform_later
+  end
+
+  def when_i_click_on_the_timestap
+    all('.timestamp-link').first.click
+  end
+
+  def then_i_should_be_on_the_timestamp_page
+    expect(current_path).to eq resque_scheduler_engine_routes.timestamp_path timestamp: some_time_in_the_future.to_i
+  end
+end

data/spec/features/delayed/send_a_delayed_job_to_the_queue_spec.rb

@@ -0,0 +1,29 @@
+require 'rails_helper'
+
+feature 'Sending a delayed job to the queue for immediate execution' do
+
+  include SharedFunctionsForFeatures
+
+  let(:queue_name) { 'ivar' }
+  let(:job_class) { 'SomeIvarJob' }
+
+  scenario 'Pressing the queue button sends the job to the queue immediately' do
+    given_there_is_a_delayed_job
+    when_i_visit_the_delayed_jobs_page
+    and_i_press_the_queue_now_button
+    then_i_should_be_on_the_overview_page
+    and_i_should_see_the_job_in_the_queue
+    when_i_click_through_to_the_queue_page
+    then_i_should_see_the_details_of_the_job_on_the_page
+    when_i_visit_the_delayed_jobs_page
+    then_i_should_not_see_any_delayed_jobs
+  end
+
+  def and_i_press_the_queue_now_button
+    click_button 'Queue now'
+  end
+
+  def then_i_should_not_see_any_delayed_jobs
+    expect(page).to have_content 'There are no delayed jobs'
+  end
+end

data/spec/features/navigation_spec.rb

@@ -2,14 +2,35 @@ require 'rails_helper'
 
 feature 'the tabs added to the resque web interface work correctly' do
   scenario 'the Schedule tab works' do
+    when_i_visit_the_resque_web_overview_page
+    and_i_follow_the_schedule_link
+    then_i_should_be_on_the_schedules_page
+  end
+
+  scenario 'the Delayed tab works' do
+    when_i_visit_the_resque_web_overview_page
+    when_i_follow_the_delayed_link
+    then_i_should_be_on_the_delayed_page
+  end
+
+  def when_i_visit_the_resque_web_overview_page
     visit ResqueWeb::Engine.app.url_helpers.overview_path
+  end
+
+  def and_i_follow_the_schedule_link
     click_link 'Schedule'
+  end
+
+  def then_i_should_be_on_the_schedules_page
     expect(current_path).to eq resque_scheduler_engine_routes.schedules_path
   end
 
-  scenario 'the Delayed tab works' do
-    visit ResqueWeb::Engine.app.url_helpers.overview_path
+  def when_i_follow_the_delayed_link
     click_link 'Delayed'
+  end
+
+  def then_i_should_be_on_the_delayed_page
     expect(current_path).to eq resque_scheduler_engine_routes.delayed_path
   end
+
 end

data/spec/features/schedules/cannot_delete_a_job_when_the_schedule_is_static.rb

@@ -1,12 +1,16 @@
 require 'rails_helper'
-
 feature 'deleting a job from the dynamic schedule' do
 
-  def visit_scheduler_page
-    visit resque_scheduler_engine_routes.schedules_path
+  include SharedFunctionsForFeatures
+
+  scenario 'the delete button is not present when the schedule is static' do
+    given_there_are_some_jobs_in_the_schedule
+    and_the_schedule_is_set_to_be_static
+    when_i_visit_the_scheduler_page
+    then_there_should_not_be_a_delete_button_for_the_job
   end
 
-  before do
+  def given_there_are_some_jobs_in_the_schedule
     Resque.schedule = {
       'some_ivar_job' => {
         'cron' => '* * * * *',
@@ -24,18 +28,18 @@ feature 'deleting a job from the dynamic schedule' do
         }
       }
     }
-    allow(Resque::Scheduler).to receive(:dynamic).and_return(false)
     Resque::Scheduler.load_schedule!
-    visit_scheduler_page
   end
 
-  after do
-    reset_the_resque_schedule
+  def and_the_schedule_is_set_to_be_static
+    allow(Resque::Scheduler).to receive(:dynamic).and_return(false)
   end
 
-  scenario 'the delete button is not present when the schedule is static' do
-    visit resque_scheduler_engine_routes.schedules_path
+  def then_there_should_not_be_a_delete_button_for_the_job
     expect(page).to_not have_css '#job_some_ivar_job .delete-button'
   end
 
+  def when_i_visit_the_scheduler_page
+    visit resque_scheduler_engine_routes.schedules_path
+  end
 end

data/spec/features/schedules/delete_a_job_from_the_dynamic_schedule_spec.rb

@@ -2,11 +2,37 @@ require 'rails_helper'
 
 feature 'deleting a job from the dynamic schedule' do
 
-  def visit_scheduler_page
-    visit resque_scheduler_engine_routes.schedules_path
-  end
+  include SharedFunctionsForFeatures
 
   before do
+    given_there_are_two_jobs_in_the_scheduler
+    and_the_schedule_is_set_up_to_be_dyamic
+    when_i_visit_the_scheduler_page
+  end
+
+  scenario 'the job disappears from the UI' do
+    when_i_delete_the_job_from_the_ui
+    then_i_should_be_on_the_scheduler_page
+    and_the_job_should_not_be_present_in_the_ui
+  end
+
+  scenario 'the other job remains in the UI' do
+    when_i_delete_the_job_from_the_ui
+    then_i_should_be_on_the_scheduler_page
+    and_the_other_job_should_still_be_present_in_the_ui
+  end
+
+  scenario 'the job is removed from the resque backend' do
+    when_i_delete_the_job_from_the_ui
+    then_i_should_be_on_the_scheduler_page
+    and_the_job_should_no_longer_be_present_in_the_resque_schedule
+  end
+
+  def and_the_schedule_is_set_up_to_be_dyamic
+    allow(Resque::Scheduler).to receive(:dynamic).and_return(true)
+  end
+
+  def given_there_are_two_jobs_in_the_scheduler
     Resque.schedule = {
       'some_ivar_job' => {
         'cron' => '* * * * *',
@@ -24,45 +50,30 @@ feature 'deleting a job from the dynamic schedule' do
         }
       }
     }
-    allow(Resque::Scheduler).to receive(:dynamic).and_return(true)
     Resque::Scheduler.load_schedule!
-    visit_scheduler_page
   end
 
-  after do
-    reset_the_resque_schedule
+  def when_i_visit_the_scheduler_page
+    visit resque_scheduler_engine_routes.schedules_path
   end
 
-  # Given there is a job in the scheduler
-  # And the schedule is set up to be dynamic
-  # When I delete the job from the UI
-  # Then I should be on the schedule page
-  # And the job should no longer be present
-  scenario 'the job disappears from the UI' do
+  def when_i_delete_the_job_from_the_ui
     find('#job_some_ivar_job .delete-button').click
-    expect(current_path).to eq resque_scheduler_engine_routes.schedules_path
-    expect(page).to_not have_css '#job_some_ivar_job'
   end
 
-  # Given there are two jobs in the scheduler
-  # And the schedule is set up to be dynamic
-  # When I delete the job from the UI
-  # Then I should be on the schedule page
-  # And the other job should still be present
-  scenario 'the other job remains in the UI' do
-    find('#job_some_ivar_job .delete-button').click
+  def then_i_should_be_on_the_scheduler_page
     expect(current_path).to eq resque_scheduler_engine_routes.schedules_path
-    expect(page).to have_css '#job_some_other_job'
   end
 
-  # Given there is a job in the scheduler
-  # And the schedule is set up to be dynamic
-  # When I delete the job from the UI
-  # Then I should be on the schedule page
-  # And the job should no longer be present in the Resque schedule
-  scenario 'the job is removed from the resque backend' do
-    find('#job_some_ivar_job .delete-button').click
-    expect(current_path).to eq resque_scheduler_engine_routes.schedules_path
+  def and_the_job_should_no_longer_be_present_in_the_resque_schedule
     expect(Resque.schedule).to_not have_key 'some_ivar_job'
   end
+
+  def and_the_other_job_should_still_be_present_in_the_ui
+    expect(page).to have_css '#job_some_other_job'
+  end
+
+  def and_the_job_should_not_be_present_in_the_ui
+    expect(page).to_not have_css '#job_some_ivar_job'
+  end
 end

data/spec/features/schedules/requeuing_a_job_with_parameters_spec.rb

@@ -1,39 +1,55 @@
 require 'rails_helper'
 
 feature 'requeuing a job that has defined params' do
+
+  include SharedFunctionsForFeatures
+
   before do
-    Resque.schedule = Test::RESQUE_SCHEDULE
-    Resque::Scheduler.load_schedule!
+    given_i_have_a_job_which_requires_params_in_the_schedule
   end
 
-  after do
-    reset_the_resque_schedule
+  scenario 'I am prompted to enter the params required for the requeued job' do
+    when_i_visit_the_schedules_page
+    and_i_requeue_the_job_with_new_params
+    then_i_should_be_on_the_overview_page
+    and_i_should_see_the_job_in_the_queue
+    when_i_click_on_the_link_to_the_queue
+    then_i_should_see_details_of_the_job_on_the_page
   end
 
-  # Given I have a job which requires params in the schedule
-  # When I press the requeue button
-  # Then I should be presented with a form that prompts me for the params
-  # When I enter the params and submit the form
-  # Then I should be on the overview page
-  # And I should see the job in the queue
-  # When I visit the queue page
-  # Then I should see the job on the page with the new params
-  scenario 'I am prompted to enter the params required for the requeued job' do
-    job_name = 'job_with_params'
-    queue_name = 'quick'
-    job_class = 'JobWithParams'
+  let(:job_name) { 'job_with_params' }
+  let(:queue_name) { 'quick' }
+  let(:job_class) { 'JobWithParams' }
 
+  def given_i_have_a_job_which_requires_params_in_the_schedule
+    Resque.schedule = Test::RESQUE_SCHEDULE
+    Resque::Scheduler.load_schedule!
+  end
+
+  def when_i_visit_the_schedules_page
     visit resque_scheduler_engine_routes.schedules_path
+  end
+
+  def and_i_requeue_the_job_with_new_params
     click_button "requeue_job_#{job_name}"
 
     fill_in 'log_level', with: 'info'
     click_button 'Queue now'
+  end
 
+  def then_i_should_be_on_the_overview_page
     expect(current_path).to eq ResqueWeb::Engine.app.url_helpers.overview_path
+  end
+
+  def and_i_should_see_the_job_in_the_queue
     expect(page).to have_content "#{queue_name} 1"
+  end
 
+  def when_i_click_on_the_link_to_the_queue
     find('.queues .queue a', text: queue_name).click
+  end
 
+  def then_i_should_see_details_of_the_job_on_the_page
     expect(page).to have_content job_class
     expect(page).to have_css 'td.args', text: /"log_level"=>"info"/
   end

data/spec/features/schedules/requeuing_a_job_without_parameters_spec.rb

@@ -1,7 +1,31 @@
 require 'rails_helper'
 
 feature 'requeuing a job that has no params' do
+
+  include SharedFunctionsForFeatures
+
   before do
+    given_i_have_a_job_which_requires_params_in_the_schedule
+  end
+
+  scenario 'I am prompted to enter the params required for the requeued job' do
+    when_i_visit_the_schedules_page
+    and_i_requeue_the_job
+    then_i_should_be_on_the_overview_page
+    and_i_should_see_the_job_in_the_queue
+    when_i_click_through_to_the_queue_page
+    then_i_should_see_the_details_of_the_job_on_the_page
+  end
+
+  let(:queue_name) { 'quick' }
+  let(:job_name) { 'job_without_params' }
+  let(:job_class) { 'JobWithoutParams' }
+
+  def when_i_visit_the_schedules_page
+    visit resque_scheduler_engine_routes.schedules_path
+  end
+
+  def given_i_have_a_job_which_requires_params_in_the_schedule
     Resque.schedule = {
       'job_without_params' => {
         'cron' => '* * * * *',
@@ -15,29 +39,9 @@ feature 'requeuing a job that has no params' do
     Resque::Scheduler.load_schedule!
   end
 
-  after do
-    reset_the_resque_schedule
-  end
-
-  # Given I have a job which requires params in the schedule
-  # When I press the requeue button
-  # Then I should be on the overview page
-  # And I should see the job in the queue
-  # When I visit the queue page
-  # Then I should see the job on the page with the new params
-  scenario 'I am prompted to enter the params required for the requeued job' do
-    job_name = 'job_without_params'
-    queue_name = 'quick'
-    job_class = 'JobWithoutParams'
-
-    visit resque_scheduler_engine_routes.schedules_path
+  def and_i_requeue_the_job
     click_button "requeue_job_#{job_name}"
+  end
 
-    expect(current_path).to eq ResqueWeb::Engine.app.url_helpers.overview_path
-    expect(page).to have_content "#{queue_name} 1"
-
-    find('.queues .queue a', text: queue_name).click
 
-    expect(page).to have_content job_class
-  end
 end

data/spec/features/schedules/scheduled_jobs_index_page_spec.rb

@@ -1,13 +1,36 @@
 require 'rails_helper'
 
 feature 'Viewing the schedule page and interacting with it' do
-  def visit_scheduler_page
-    visit resque_scheduler_engine_routes.schedules_path
-  end
+
+  include SharedFunctionsForFeatures
 
   before do
+    given_the_resque_scheduler_is_using_the_production_environment
+    and_there_are_several_jobs_in_the_schedule
+    when_i_visit_the_scheduler_page
+  end
+
+  scenario 'the page has the correct title' do
+    then_the_page_should_have_the_correct_title
+  end
+
+  scenario 'the index shows the scheduled job' do
+    then_the_page_should_have_the_class_name_of_the_job_in_this_env
+  end
+
+  scenario 'the index excludes jobs for other envs' do
+    then_the_page_should_not_have_the_name_of_jobs_from_other_envs
+  end
+
+  scenario 'the index includes job used in multiple environments' do
+    then_the_page_should_have_the_name_of_jobs_in_both_this_and_other_envs
+  end
+
+  def given_the_resque_scheduler_is_using_the_production_environment
     Resque::Scheduler.env = 'production'
+  end
 
+  def and_there_are_several_jobs_in_the_schedule
     Resque.schedule = {
       'some_ivar_job' => {
         'cron' => '* * * * *',
@@ -38,46 +61,34 @@ feature 'Viewing the schedule page and interacting with it' do
       }
     }
     Resque::Scheduler.load_schedule!
-    visit_scheduler_page
   end
 
-  after do
-    reset_the_resque_schedule
+  def when_i_visit_the_resque_web_home_page
+    visit '/resque_web'
   end
 
-  it 'Link to Schedule page in navigation works' do
-    visit '/resque_web'
+  def and_i_click_the_schedule_link
     click_link 'Schedule'
-    assert page.has_css? 'h1', 'Schedule'
   end
 
-  it 'has the correct title' do
+  def then_the_page_should_have_the_correct_title
     assert page.has_css?('h1', 'Schedule')
   end
 
-  it 'shows the scheduled job' do
+  def then_the_page_should_have_the_class_name_of_the_job_in_this_env
     assert page.body.include?('SomeIvarJob')
   end
 
-  it 'excludes jobs for other envs' do
+  def then_the_page_should_not_have_the_name_of_jobs_from_other_envs
     refute page.body.include?('SomeFancyJob')
   end
 
-  it 'includes job used in multiple environments' do
+  def then_the_page_should_have_the_name_of_jobs_in_both_this_and_other_envs
     assert page.body.include?('SomeSharedEnvJob')
   end
 
-  it 'allows delete when dynamic' do
-    allow(Resque::Scheduler).to receive(:dynamic).and_return(true)
-    visit_scheduler_page
-
-    assert page.body.include?('Delete')
+  def when_i_visit_the_scheduler_page
+    visit resque_scheduler_engine_routes.schedules_path
   end
 
-  it "doesn't allow delete when static" do
-    allow(Resque::Scheduler).to receive(:dynamic).and_return(false)
-    visit_scheduler_page
-
-    refute page.body.include?('Delete')
-  end
 end

data/spec/spec_helper.rb

@@ -6,6 +6,7 @@ ENV['RAILS_ENV'] = 'test'
 require 'resque'
 require 'resque-scheduler'
 require_relative 'support/functions'
+require_relative 'support/shared_steps'
 
 
 Resque::Scheduler.configure do |c|

data/spec/support/shared_steps.rb

@@ -0,0 +1,47 @@
+module SharedFunctionsForFeatures
+
+  def self.included(base)
+    base.instance_eval do
+      let(:some_time_in_the_future) { Time.now + 3600 }
+      let(:some_other_time_in_the_future) { Time.now + 4600 }
+
+      after do
+        reset_the_resque_schedule
+      end
+    end
+  end
+
+  def when_i_visit_the_delayed_jobs_page
+    visit resque_scheduler_engine_routes.delayed_path
+  end
+
+  def then_i_should_be_on_the_delayed_jobs_page
+    expect(current_path).to eq resque_scheduler_engine_routes.delayed_path
+  end
+
+  def given_there_are_two_delayed_jobs_enqueued_at_different_times
+    Resque.enqueue_at(some_time_in_the_future, SomeIvarJob)
+    Resque.enqueue_at(some_other_time_in_the_future, JobWithoutParams)
+  end
+
+  def given_there_is_a_delayed_job
+    Resque.enqueue_at(some_time_in_the_future, SomeIvarJob)
+  end
+
+  def then_i_should_be_on_the_overview_page
+    expect(current_path).to eq ResqueWeb::Engine.app.url_helpers.overview_path
+  end
+
+  def and_i_should_see_the_job_in_the_queue
+    expect(page).to have_content "#{queue_name} 1"
+  end
+
+  def when_i_click_through_to_the_queue_page
+    find('.queues .queue a', text: queue_name).click
+  end
+
+  def then_i_should_see_the_details_of_the_job_on_the_page
+    expect(page).to have_content job_class
+  end
+end
+

data/spec/support/test_jobs.rb

@@ -1,3 +1,5 @@
+require 'active_job'
+
 # Allows us to test that we can find working jobs
 class OngoingJob
   def self.queue
@@ -46,6 +48,18 @@ JobWithoutParams = Class.new(JobWithParams) do
   @queue = :quick
 end
 
+class ActiveJobTest < ActiveJob::Base
+  queue_as :test_queue
+
+  def self.queue
+    queue_name
+  end
+
+  def perform
+
+  end
+end
+
 # Test module
 module Foo
   # Test class

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resque-scheduler-web
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Matt Gibson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-28 00:00:00.000000000 Z
+date: 2015-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque-web
@@ -205,6 +205,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -275,8 +276,12 @@ files:
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
+- spec/features/delayed/cancel_delayed_job_spec.rb
+- spec/features/delayed/clear_all_jobs_spec.rb
 - spec/features/delayed/delayed_jobs_index_page_spec.rb
 - spec/features/delayed/delayed_jobs_timestamp_page_spec.rb
+- spec/features/delayed/see_all_timestamps_for_a_class_spec.rb
+- spec/features/delayed/send_a_delayed_job_to_the_queue_spec.rb
 - spec/features/navigation_spec.rb
 - spec/features/schedules/cannot_delete_a_job_when_the_schedule_is_static.rb
 - spec/features/schedules/delete_a_job_from_the_dynamic_schedule_spec.rb
@@ -290,6 +295,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/functions.rb
 - spec/support/redis_instance.rb
+- spec/support/shared_steps.rb
 - spec/support/test_jobs.rb
 homepage: https://github.com/mattgibson/resque-scheduler-web
 licenses:
@@ -362,8 +368,12 @@ test_files:
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
+- spec/features/delayed/cancel_delayed_job_spec.rb
+- spec/features/delayed/clear_all_jobs_spec.rb
 - spec/features/delayed/delayed_jobs_index_page_spec.rb
 - spec/features/delayed/delayed_jobs_timestamp_page_spec.rb
+- spec/features/delayed/see_all_timestamps_for_a_class_spec.rb
+- spec/features/delayed/send_a_delayed_job_to_the_queue_spec.rb
 - spec/features/navigation_spec.rb
 - spec/features/schedules/cannot_delete_a_job_when_the_schedule_is_static.rb
 - spec/features/schedules/delete_a_job_from_the_dynamic_schedule_spec.rb
@@ -377,4 +387,5 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/functions.rb
 - spec/support/redis_instance.rb
+- spec/support/shared_steps.rb
 - spec/support/test_jobs.rb