Add 'Return To Application' Link to Menu Bar

Gemfile

@@ -8,5 +8,6 @@ gem 'sqlite3'
 gem 'dotenv-rails'
 gem 'minitest-spec-rails'
 gem 'coveralls', require: false
+gem 'rails-controller-testing'
 gem 'redcard'
 gem 'mocha', require: false

Gemfile.lock

@@ -12,83 +12,86 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.0.2)
-      actionpack (= 5.0.2)
-      nio4r (>= 1.2, < 3.0)
+    actioncable (5.0.0)
+      actionpack (= 5.0.0)
+      nio4r (~> 1.2)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.0.2)
-      actionpack (= 5.0.2)
-      actionview (= 5.0.2)
-      activejob (= 5.0.2)
+    actionmailer (5.0.0)
+      actionpack (= 5.0.0)
+      actionview (= 5.0.0)
+      activejob (= 5.0.0)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.0.2)
-      actionview (= 5.0.2)
-      activesupport (= 5.0.2)
+    actionpack (5.0.0)
+      actionview (= 5.0.0)
+      activesupport (= 5.0.0)
       rack (~> 2.0)
       rack-test (~> 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.2)
-      activesupport (= 5.0.2)
+    actionview (5.0.0)
+      activesupport (= 5.0.0)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.0.2)
-      activesupport (= 5.0.2)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (5.0.0)
+      activesupport (= 5.0.0)
       globalid (>= 0.3.6)
-    activemodel (5.0.2)
-      activesupport (= 5.0.2)
-    activerecord (5.0.2)
-      activemodel (= 5.0.2)
-      activesupport (= 5.0.2)
+    activemodel (5.0.0)
+      activesupport (= 5.0.0)
+    activerecord (5.0.0)
+      activemodel (= 5.0.0)
+      activesupport (= 5.0.0)
       arel (~> 7.0)
-    activesupport (5.0.2)
+    activesupport (5.0.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    appraisal (2.1.0)
+    appraisal (2.2.0)
       bundler
       rake
       thor (>= 0.14.0)
-    arel (7.1.4)
-    builder (3.2.3)
-    coffee-rails (4.2.1)
+    arel (7.0.0)
+    builder (3.2.2)
+    coffee-rails (4.2.2)
       coffee-script (>= 2.2.0)
-      railties (>= 4.0.0, < 5.2.x)
+      railties (>= 4.0.0)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
     commonjs (0.2.7)
-    concurrent-ruby (1.0.5)
-    concurrent-ruby (1.0.5-java)
-    coveralls (0.8.19)
-      json (>= 1.8, < 3)
-      simplecov (~> 0.12.0)
+    concurrent-ruby (1.0.2)
+    concurrent-ruby (1.0.2-java)
+    coveralls (0.8.1)
+      json (~> 1.8)
+      rest-client (>= 1.6.8, < 2)
+      simplecov (~> 0.10.0)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
-      tins (~> 1.6)
     docile (1.1.5)
-    dotenv (2.2.0)
-    dotenv-rails (2.2.0)
-      dotenv (= 2.2.0)
-      railties (>= 3.2, < 5.1)
+    domain_name (0.5.24)
+      unf (>= 0.0.5, < 1.0.0)
+    dotenv (2.0.1)
+    dotenv-rails (2.0.1)
+      dotenv (= 2.0.1)
     erubis (2.7.0)
-    execjs (2.7.0)
+    execjs (2.5.2)
     font-awesome-sass (4.7.0)
       sass (>= 3.2)
-    globalid (0.3.7)
+    globalid (0.3.6)
       activesupport (>= 4.1.0)
-    i18n (0.8.1)
+    http-cookie (1.0.2)
+      domain_name (~> 0.5)
+    i18n (0.7.0)
     jquery-rails (4.3.1)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (2.0.3)
-    json (2.0.3-java)
+    json (1.8.3)
+    json (1.8.3-java)
     less (2.6.0)
       commonjs (~> 0.2.7)
     less-rails (2.8.0)
@@ -102,103 +105,123 @@ GEM
       mime-types (>= 1.16, < 4)
     metaclass (0.0.4)
     method_source (0.8.2)
-    mime-types (3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
+    mime-types (2.99.2)
     mini_portile2 (2.1.0)
-    minitest (5.10.1)
-    minitest-spec-rails (5.4.0)
+    minitest (5.9.0)
+    minitest-spec-rails (5.3.0)
       minitest (~> 5.0)
       rails (>= 4.1)
-    mocha (1.2.1)
+    mocha (1.1.0)
       metaclass (~> 0.0.1)
     mono_logger (1.1.0)
     multi_json (1.12.1)
-    nio4r (2.0.0)
-    nio4r (2.0.0-java)
-    nokogiri (1.7.1)
+    mustermann (1.0.0)
+    netrc (0.10.3)
+    nio4r (1.2.1)
+    nio4r (1.2.1-java)
+    nokogiri (1.6.8)
       mini_portile2 (~> 2.1.0)
-    nokogiri (1.7.1-java)
+      pkg-config (~> 1.1.7)
+    nokogiri (1.6.8-java)
+    pkg-config (1.1.7)
     rack (2.0.1)
+    rack-protection (2.0.0)
+      rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (5.0.2)
-      actioncable (= 5.0.2)
-      actionmailer (= 5.0.2)
-      actionpack (= 5.0.2)
-      actionview (= 5.0.2)
-      activejob (= 5.0.2)
-      activemodel (= 5.0.2)
-      activerecord (= 5.0.2)
-      activesupport (= 5.0.2)
+    rails (5.0.0)
+      actioncable (= 5.0.0)
+      actionmailer (= 5.0.0)
+      actionpack (= 5.0.0)
+      actionview (= 5.0.0)
+      activejob (= 5.0.0)
+      activemodel (= 5.0.0)
+      activerecord (= 5.0.0)
+      activesupport (= 5.0.0)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 5.0.2)
+      railties (= 5.0.0)
       sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.2)
+    rails-controller-testing (1.0.1)
+      actionpack (~> 5.x)
+      actionview (~> 5.x)
+      activesupport (~> 5.x)
+    rails-dom-testing (2.0.1)
       activesupport (>= 4.2.0, < 6.0)
-      nokogiri (~> 1.6)
+      nokogiri (~> 1.6.0)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (5.0.2)
-      actionpack (= 5.0.2)
-      activesupport (= 5.0.2)
+    railties (5.0.0)
+      actionpack (= 5.0.0)
+      activesupport (= 5.0.0)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (12.0.0)
+    rake (11.2.2)
     redcard (1.1.0)
     redis (3.3.3)
     redis-namespace (1.5.3)
       redis (~> 3.0, >= 3.0.4)
-    resque (1.27.2)
+    resque (1.27.4)
       mono_logger (~> 1.0)
       multi_json (~> 1.0)
       redis-namespace (~> 1.3)
       sinatra (>= 0.9.2)
       vegas (~> 0.1.2)
-    sass (3.4.23)
+    rest-client (1.8.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
+    sass (3.4.24)
     sass-rails (5.0.6)
       railties (>= 4.0.0, < 6)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    simplecov (0.12.0)
+    simplecov (0.10.0)
       docile (~> 1.1.0)
-      json (>= 1.8, < 3)
+      json (~> 1.8)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    sinatra (1.0)
-      rack (>= 1.0)
-    sprockets (3.7.1)
+    sinatra (2.0.0)
+      mustermann (~> 1.0)
+      rack (~> 2.0)
+      rack-protection (= 2.0.0)
+      tilt (~> 2.0)
+    sprockets (3.6.3)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.0)
+    sprockets-rails (3.1.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sqlite3 (1.3.13)
-    term-ansicolor (1.4.0)
+    sqlite3 (1.3.10)
+    term-ansicolor (1.3.0)
       tins (~> 1.0)
-    thor (0.19.4)
-    thread_safe (0.3.6)
-    thread_safe (0.3.6-java)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    thread_safe (0.3.5-java)
     tilt (2.0.7)
-    tins (1.13.2)
-    twitter-bootstrap-rails (4.0.0)
-      actionpack (~> 5.0, >= 5.0.1)
-      execjs (~> 2.7)
-      less-rails (~> 2.8, >= 2.8.0)
-      railties (~> 5.0, >= 5.0.1)
-    tzinfo (1.2.3)
+    tins (1.5.1)
+    twitter-bootstrap-rails (3.2.2)
+      actionpack (>= 3.1)
+      execjs (>= 2.2.2, >= 2.2)
+      less-rails (>= 2.5.0)
+      railties (>= 3.1)
+    tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (3.1.12)
-      execjs (>= 0.3.0, < 3)
+    uglifier (2.7.1)
+      execjs (>= 0.3.0)
+      json (>= 1.8.0)
+    unf (0.1.4)
+      unf_ext
+    unf (0.1.4-java)
+    unf_ext (0.0.7.1)
     vegas (0.1.11)
       rack (>= 1.0.0)
-    websocket-driver (0.6.5)
+    websocket-driver (0.6.4)
       websocket-extensions (>= 0.1.0)
-    websocket-driver (0.6.5-java)
+    websocket-driver (0.6.4-java)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
 
@@ -212,6 +235,7 @@ DEPENDENCIES
   dotenv-rails
   minitest-spec-rails
   mocha
+  rails-controller-testing
   redcard
   resque-web!
   sqlite3

app/views/layouts/resque_web/application.html.erb

@@ -45,6 +45,9 @@
           <% tabs.each do |tab_name,path| %>
             <%= tab tab_name,path %>
           <% end %>
+          <% if respond_to?(:main_app) %>
+            <li><%= link_to "Return to Application", main_app.root_path, :class => "nav navbar-nav" %></li>
+          <% end %>
         </ul>
       </div>
     </div>

app/views/resque_web/failures/show.html.erb

@@ -13,8 +13,8 @@
 
 <ul class="failed">
   <% @jobs.each do |id, job| %>
-    <%= render :partial => 'failed_job', :locals => {:id => id, :job => job} %>
+    <%= render :partial => 'failed_job', :locals => {:id => job['id'] || id, :job => job} %>
   <% end %>
 </ul>
 
-<%= pagination :start => failure_start_at, :total => failure_size unless params[:class] %>
+<%= pagination :start => failure_start_at, :total => failure_size unless params[:class] %>

app/views/resque_web/queues/show.html.erb

@@ -11,11 +11,13 @@
   <p class="sub">Showing <%= queue_start_at %> to <%= queue_end_at %> of <b><%= queue_size %></b> jobs</p>
   <table class="table table-bordered jobs">
     <tr>
+      <th>ID</th>
       <th>Class</th>
       <th>Args</th>
     </tr>
     <% queue_jobs.each do |job| %>
     <tr>
+      <td class='id'><%= job['id'] %></td>
       <td class='class'><%= job['class'] %></td>
       <td class='args'><%=h job['args'].inspect %></td>
     </tr>

test/dummy/app/controllers/portal_controller.rb

@@ -0,0 +1,5 @@
+class PortalController < ApplicationController
+
+  def index
+  end
+end

test/dummy/app/views/portal/index.html.erb

@@ -0,0 +1,2 @@
+<h1> This is the root page </h1>
+

test/dummy/config/routes.rb

@@ -1,4 +1,4 @@
 Rails.application.routes.draw do
-
+  root :to => "portal#index"
   mount ResqueWeb::Engine => "/resque_web"
 end