update gov one helper and specs

app/helpers/gov_one_helper.rb

@@ -7,23 +7,20 @@ def login_uri
       client_id: Rails.application.config.gov_one_client_id,
       nonce: SecureRandom.uuid,
       state: SecureRandom.uuid,
-      redirect_uri: GovOneAuthService::CALLBACKS[:login],
     }
 
     session[:gov_one_auth_state] = params[:state]
 
-    gov_one_uri(:login, params).to_s
+    "#{gov_one_uri(:login, params)}&redirect_uri=#{GovOneAuthService::CALLBACKS[:login]}"
   end
 
   # @return [String]
   def logout_uri
     params = {
       id_token_hint: session[:id_token],
       state: SecureRandom.uuid,
-      post_logout_redirect_uri: GovOneAuthService::CALLBACKS[:logout],
     }
-
-    gov_one_uri(:logout, params).to_s
+    "#{gov_one_uri(:logout, params)}&post_logout_redirect_uri=#{GovOneAuthService::CALLBACKS[:logout]}"
   end
 
   # @return [String]

spec/helpers/gov_one_helper_spec.rb

@@ -5,8 +5,8 @@
     subject(:login_uri) { helper.login_uri }
 
     it 'encodes the authorize endpoint params' do
-      expect(login_uri).to start_with 'https://oidc.test.account.gov.uk/authorize?response_type=code&scope=email+openid&client_id='
-      expect(login_uri).to end_with 'redirect_uri=http%3A%2F%2Frecovery.app%2Fusers%2Fauth%2Fopenid_connect%2Fcallback'
+      expect(login_uri).to start_with 'https://oidc.test.account.gov.uk/authorize?response_type=code&scope=email+openid&client_id=some_client_id&'
+      expect(login_uri).to end_with 'redirect_uri=http://recovery.app/users/auth/openid_connect/callback'
     end
   end
 
@@ -15,25 +15,27 @@
 
     it 'encodes the logout endpoint params' do
       expect(logout_uri).to start_with 'https://oidc.test.account.gov.uk/logout?id_token_hint&state='
-      expect(logout_uri).to end_with '&post_logout_redirect_uri=http%3A%2F%2Frecovery.app%2Fusers%2Fsign_out'
+      expect(logout_uri).to end_with '&post_logout_redirect_uri=http://recovery.app/users/sign_out'
     end
   end
 
   describe '#login_button' do
     subject(:login_button) { helper.login_button }
 
-    it 'returns a link to the login uri' do
+    it 'returns a button link to the gov one login uri' do
       expect(login_button).to include 'govuk-button'
       expect(login_button).to include 'Sign in with Gov One Login'
+      expect(login_button).to include 'href="https://oidc.test.account.gov.uk/authorize?response_type=code&scope=email+openid&client_id=some_client_id&'
     end
   end
 
   describe '#logout_button' do
     subject(:logout_button) { helper.logout_button }
 
-    it 'returns a link to the login uri' do
+    it 'returns a button link to the gov one logout uri' do
       expect(logout_button).to include 'govuk-button'
       expect(logout_button).to include 'Sign out of Gov One Login'
+      expect(logout_button).to include 'href="https://oidc.test.account.gov.uk/logout?id_token_hint&state='
     end
   end
 end

spec/models/user_spec.rb

@@ -211,7 +211,7 @@
     let(:email) { '[email protected]' }
     let(:gov_one_id) { '123' }
 
-    context 'when user exists with email but no gov_one_id' do
+    context 'with an existing user having an email but no gov_one_id' do
       let!(:user) { create(:user, email: email) }
 
       it 'updates the user gov_one_id' do
@@ -220,7 +220,7 @@
       end
     end
 
-    context 'when user exists with gov_one_id' do
+    context 'with an existing user having a gov_one_id' do
       let!(:user) { create(:user, gov_one_id: gov_one_id) }
 
       it 'updates the user email' do
@@ -229,7 +229,7 @@
       end
     end
 
-    context 'when user does not exist' do
+    context 'without an existing user' do
       let(:email) { '[email protected]' }
       let(:gov_one_id) { '321' }