Merge branch 'main' into invite_new_user

README.md

@@ -1,15 +1,13 @@
 [![CI/CD Pipeline](https://github.com/communitiesuk/mhclg-data-collection-beta/actions/workflows/pipeline.yml/badge.svg?branch=main&event=push)](https://github.com/communitiesuk/mhclg-data-collection-beta/actions/workflows/pipeline.yml)
 
-# Data Collection App
-
-This is the codebase for the Ruby on Rails app that will handle the submission of Lettings and Sales of Social Housing in England data.
+# Log social housing lettings and sales (CORE)
 
+This is the codebase for the Ruby on Rails app that will handle the submission of lettings and sales of social housing data in England.
 
 ## API documentation
 
 API documentation can be found here: https://communitiesuk.github.io/mhclg-data-collection-beta/. This is driven by [OpenAPI docs](docs/api/DLUHC-CORE-Data.v1.json)
 
-
 ## Required Setup
 
 Pre-requisites:

app/views/layouts/application.html.erb

@@ -33,14 +33,15 @@
 
     <%= govuk_header(
         logotype: 'GOV.UK',
-        service_name: 'Share Lettings and Sales for Social Housing in England Data with DLUHC',
+        service_name: t('service_name'),
         service_url: '/'
       ) do |component|
         if current_user.nil?
-          component.navigation_item(text: 'Case logs', href: case_logs_path)
+          component.navigation_item(text: 'Sign in', href: user_session_path)
         elsif
+          component.navigation_item(text: 'Case logs', href: case_logs_path)
           component.navigation_item(text: 'Your organisation', href: "/organisations/#{current_user.organisation.id}")
-          component.navigation_item(text: 'Your account', href: '/users/account')
+          component.navigation_item(text: 'Your account', href: users_account_path)
           component.navigation_item(text: 'Sign out', href: destroy_user_session_path, options: {:method => :delete})
         end
       end

config/locales/en.yml

@@ -30,4 +30,4 @@
 # available at https://guides.rubyonrails.org/i18n.html.
 
 en:
-  hello: "Hello world"
+  service_name: "Log social housing lettings and sales (CORE)"

spec/features/test_spec.rb

@@ -2,7 +2,7 @@ require "rails_helper"
 RSpec.describe "Test Features" do
   it "Displays the name of the app" do
     visit("/")
-    expect(page).to have_content("Share Lettings and Sales for Social Housing in England Data with DLUHC")
+    expect(page).to have_content("Log social housing lettings and sales (CORE)")
   end
 
   it "Links to the About page" do

spec/features/user_spec.rb

@@ -87,12 +87,12 @@ RSpec.describe "User Features" do
 
     it "Can navigate and sign in page with sign in button" do
       visit("/")
-      expect(page).to have_link("Case logs")
-      click_link("Case logs")
+      expect(page).to have_link("Sign in")
+      click_link("Sign in")
       fill_in("user[email]", with: user.email)
       fill_in("user[password]", with: "pAssword1")
       click_button("Sign in")
-      expect(page).to have_current_path("/case-logs")
+      expect(page).to have_current_path("/")
     end
 
     it "tries to access account page, redirects to log in page" do