304 - Tackles the webkit-issue by adding another POST-based route for…

… logout (#365)

* Add a POST-based route for log out instead of DELETE-based

* Fix test to check against newly added route

app/views/application/_navbar.html.erb

@@ -46,7 +46,7 @@
         </a>
         <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
           <%= link_to('Profile', user_path(current_user), class: "dropdown-item") %>
-          <%= link_to('Logout', destroy_user_session_path, method: :delete, class: "text-danger dropdown-item") %>
+          <%= link_to('Logout', new_sign_out_path, method: :post, class: "text-danger dropdown-item") %>
         </div>
       </li>
       <% end %>

config/routes.rb

@@ -39,6 +39,9 @@
   get 'slack/new' => 'slack#new', as: :new_slack
   get 'slack/auth' => 'slack#update', as: :update_slack
 
+  devise_scope :user do # temporary fix related to GitHub issue 304
+    post '/users/new_sign_out' => 'devise/sessions#destroy', as: :new_sign_out
+  end
   devise_for :users,
              path: 'users',
              controllers: {

db/schema.rb

@@ -62,8 +62,8 @@
     t.datetime "updated_at", null: false
     t.integer "port"
     t.string "application_name"
-    t.integer "user_id"
     t.text "description"
+    t.integer "user_id"
     t.index ["user_id"], name: "index_requests_on_user_id"
   end
 
@@ -129,11 +129,11 @@
     t.string "current_sign_in_ip"
     t.string "last_sign_in_ip"
     t.integer "role"
-    t.string "first_name"
-    t.string "last_name"
-    t.string "ssh_key"
     t.string "provider"
     t.string "uid"
+    t.string "ssh_key"
+    t.string "first_name"
+    t.string "last_name"
     t.integer "user_id"
     t.boolean "email_notifications", default: false
     t.index ["email"], name: "index_users_on_email", unique: true
@@ -146,8 +146,6 @@
     t.integer "user_id"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.index ["request_id"], name: "index_users_assigned_to_requests_on_request_id"
-    t.index ["user_id"], name: "index_users_assigned_to_requests_on_user_id"
   end
 
   create_table "users_virtual_machine_configs", id: false, force: :cascade do |t|

spec/features/sessions/user_sign_out_spec.rb

@@ -9,7 +9,7 @@
   end
 
   it 'has a logout button' do
-    expect(page).to have_link 'Logout', href: destroy_user_session_path
+    expect(page).to have_link 'Logout', href: new_sign_out_path
   end
 
   it 'logs out the user' do