Merge branch 'send-csrf-tokens-with-trigger-and-unlock-actions' of https://github.com/kcdragon/sidetiq into kcdragon-send-csrf-tokens-with-trigger-and-unlock-actions

lib/sidetiq/views/locks.erb

@@ -36,6 +36,7 @@
           </td>
             <td>
               <form action="<%= "#{root_path}sidetiq/#{meta.key}/unlock" %>" method="post">
+                <%= csrf_tag %>
                 <input class="btn btn-danger btn-small" type="submit" name="trigger" value="Unlock" data-confirm="Are you sure you want remove this lock?" />
               </form>
             </td>

lib/sidetiq/views/sidetiq.erb

@@ -37,6 +37,7 @@
             </td>
             <td>
               <form action="<%= "#{root_path}sidetiq/#{worker.name}/trigger" %>" method="post">
+                <%= csrf_tag %>
                 <input class="btn btn-danger btn-small" type="submit" name="trigger" value="Trigger" data-confirm="Are you sure you want to trigger this job?" />
               </form>
             </td>

test/helper.rb

@@ -1,4 +1,5 @@
-ENV['RACK_ENV'] = 'test'
+ENV['RACK_ENV'] ||= 'test'
+
 if RUBY_PLATFORM != "java"
   require 'coveralls'
   Coveralls.wear!