Improve redirect uri state and fix all remaining tests

2 files changed, 7 insertions, 8 deletions

diff --git a/spec/controllers/google_api/authorizations_controller_spec.rb b/spec/controllers/google_api/authorizations_controller_spec.rb
index 253cfab64d1..80d553f0f34 100644
--- a/spec/controllers/google_api/authorizations_controller_spec.rb
+++ b/spec/controllers/google_api/authorizations_controller_spec.rb
@@ -24,20 +24,19 @@ describe GoogleApi::AuthorizationsController do
         .to eq(expires_at)
     end
 
-    context 'when second redirection url key is stored in state' do
+    context 'when redirect uri key is stored in state' do
       set(:project) { create(:project) }
-      let(:second_redirect_uri) { project_clusters_url(project).to_s }
+      let(:redirect_uri) { project_clusters_url(project).to_s }
 
       before do
-        GoogleApi::CloudPlatform::Client
-          .session_key_for_second_redirect_uri.tap do |key, secure|
-          @state = secure
-          session[key] = second_redirect_uri
+        @state = GoogleApi::CloudPlatform::Client
+          .new_session_key_for_redirect_uri do |key|
+          session[key] = redirect_uri
         end
       end
 
       it 'redirects to the URL stored in state param' do
-        expect(subject).to redirect_to(second_redirect_uri)
+        expect(subject).to redirect_to(redirect_uri)
       end
     end
 
diff --git a/spec/controllers/projects/clusters_controller_spec.rb b/spec/controllers/projects/clusters_controller_spec.rb
index b34702370e8..7985028d73b 100644
--- a/spec/controllers/projects/clusters_controller_spec.rb
+++ b/spec/controllers/projects/clusters_controller_spec.rb
@@ -190,7 +190,7 @@ describe Projects::ClustersController do
         subject
 
         expect(response).to have_http_status(:ok)
-        expect(response.body).to include("Save changes")
+        expect(response.body).to include("Save")
       end
 
       it "allows remove integration" do