Various bug fixes (#53)

Author: Oli0li

app/controllers/concerns/authentication.rb

@@ -35,7 +35,7 @@ def request_authentication
     end
 
     def after_authentication_url
-      session.delete(:return_to_after_authenticating) || root_url
+      session.delete(:return_to_after_authenticating) || regions_url
     end
 
     def start_new_session_for(user)

app/controllers/registrations_controller.rb

@@ -46,7 +46,7 @@
 
         <li class="sidebar-item">
           <%= link_to regions_path, class: "sidebar-link" do %>
-            <i class="bi bi-hospital-fill"></i>
+            <i class="bi bi-globe"></i>
             <span>Regions</span>
           <% end %>
         </li>

app/views/layouts/_sidebar.html.erb

@@ -1,12 +1,13 @@
-<h1>User list </h1>
-
 <div class="page-heading">
   <section class="section">
     <div class="card">
-      <div class="card-body">
-        <%= link_to new_region_path, class: "btn btn-primary m-2" do %>
+      <div class="card-header d-flex justify-content-between align-items-center">
+        <h2>User List</h2>
+        <%= link_to new_user_path, class: "btn btn-primary m-2" do %>
           <i class="bi bi-plus"></i> Add New User
         <% end %>
+      </div>
+      <div class="card-body">
         <table class="table table-striped" id="table1">
           <thead>
             <tr>

app/views/registrations/new.html.erb

@@ -15,6 +15,11 @@
       get users_url
       expect(response).to be_successful
     end
+
+    it "has a link to add a new user" do
+      get users_url
+      expect(page).to have_link("Add New User", href: new_user_path)
+    end
   end
 
   describe "GET /new" do

app/views/users/index.html.erb

@@ -6,6 +6,12 @@
   Capybara::Selenium::Driver.new(app, browser: :chrome)
 end
 
+module CapybaraPage
+  def page
+    Capybara.string(response.body)
+  end
+end
+
 RSpec.configure do |config|
   config.before(:each, type: :system) do
     driven_by :rack_test
@@ -14,4 +20,6 @@
   config.before(:each, :debug, type: :system) do
     driven_by :selenium_chrome
   end
+
+  config.include CapybaraPage, type: :request
 end

spec/requests/users_spec.rb

@@ -1,19 +1,19 @@
 require "rails_helper"
 
 RSpec.describe "User Login", type: :system do
+  # will probably need to be amended once we have a page for non-Admin users
   let!(:user) { create(:user) }
 
-  # context "with correct email and password" do
-  #   it "logs in the user" do
-  #     visit new_session_path
-  #     fill_in "email", with: user.email
-  #     fill_in "password", with: user.password
-  #     click_button("Sign in")
+  context "with correct email and password" do
+    it "logs in the user" do
+      visit new_session_path
+      fill_in "email", with: user.email
+      fill_in "password", with: user.password
+      click_button("Sign in")
 
-  #     # will probably need to be amended once we have a page for non-Admin users
-  #     expect(page).to have_text("Administration")
-  #   end
-  # end
+      expect(page).to have_text("Regions Served")
+    end
+  end
 
   context "with incorrect email or password" do
     it "shows error message" do