Adpat tests to new page structure on MyAccount > security

Author: HDinger

modules/two_factor_authentication/app/controllers/two_factor_authentication/my/two_factor_devices_controller.rb

@@ -98,7 +98,7 @@ def request_token_for_device(device, locals)
           default_message = t("two_factor_authentication.devices.confirm_send_failed")
           flash[:error] = "#{default_message} #{error}"
 
-          redirect_to action: :index
+          redirect_to index_path
         end
       end
 

modules/two_factor_authentication/spec/controllers/two_factor_authentication/my/two_factor_devices_controller_spec.rb

@@ -29,7 +29,7 @@
 
   describe "accessing" do
     before do
-      get :index
+      get :new
     end
 
     context "when not logged in" do
@@ -38,7 +38,7 @@
 
       it "does not give access" do
         expect(response).to be_redirect
-        expect(response).to redirect_to signin_path(back_url: my_2fa_devices_url)
+        expect(response).to redirect_to signin_path(back_url: new_my_2fa_device_url)
       end
     end
 
@@ -51,9 +51,9 @@
     context "when logged in and active strategies" do
       let(:active_strategies) { [:developer] }
 
-      it "renders the index page" do
+      it "renders the new type selection page" do
         expect(response).to be_successful
-        expect(response).to render_template "index"
+        expect(response).to render_template "new_type"
       end
     end
   end
@@ -149,7 +149,7 @@
               .and_return(ServiceResult.failure)
 
             get :confirm, params: { device_id: device.id }
-            expect(response).to redirect_to action: :index
+            expect(response).to redirect_to my_security_path
             expect(flash[:error]).to include I18n.t("two_factor_authentication.devices.confirm_send_failed")
           end
         end
@@ -167,7 +167,7 @@
 
           it "renders a 400 on missing token" do
             post :confirm, params: { device_id: device.id }
-            expect(response).to redirect_to action: :index
+            expect(response).to redirect_to my_security_path
           end
 
           it "redirects to the confirmation on faulty entry" do
@@ -192,7 +192,7 @@
                 .and_return(ServiceResult.success)
 
               post :confirm, params: { device_id: device.id, otp: "1234" }
-              expect(response).to redirect_to action: :index
+              expect(response).to redirect_to my_security_path
               expect(flash[:notice]).to include I18n.t("two_factor_authentication.devices.registration_complete")
               device.reload
               expect(device.active).to be true
@@ -212,7 +212,7 @@
                 # rubocop:enable RSpec/AnyInstance
 
                 post :confirm, params: { device_id: device.id, otp: "1234" }
-                expect(response).to redirect_to action: :index
+                expect(response).to redirect_to my_security_path
                 expect(flash[:notice]).to include I18n.t("two_factor_authentication.devices.registration_complete")
                 device.reload
                 expect(device.active).to be true
@@ -241,7 +241,7 @@
 
           it "deletes it" do
             delete :destroy, params: { device_id: device.id }
-            expect(response).to redirect_to action: :index
+            expect(response).to redirect_to my_security_path
             expect(user.otp_devices.reload).to eq []
           end
         end
@@ -251,7 +251,7 @@
 
           it "deletes it" do
             delete :destroy, params: { device_id: device.id }
-            expect(response).to redirect_to action: :index
+            expect(response).to redirect_to my_security_path
             expect(user.otp_devices.reload).to eq []
           end
         end

modules/two_factor_authentication/spec/routing/two_factor_authentication/my/two_factor_devices_spec.rb

@@ -31,10 +31,6 @@
 require "spec_helper"
 
 RSpec.describe "users 2fa devices" do
-  it "route to index" do
-    expect(get("/my/two_factor_devices")).to route_to("two_factor_authentication/my/two_factor_devices#index")
-  end
-
   it "route to new" do
     expect(get("/my/two_factor_devices/new")).to route_to("two_factor_authentication/my/two_factor_devices#new")
   end

spec/controllers/my_controller_spec.rb

@@ -38,6 +38,18 @@
   end
 
   describe "password change" do
+    describe "security" do
+      render_views
+
+      before do
+        get :security
+      end
+
+      it "does render 'Change password' section" do
+        expect(response.body).to have_css(".Subhead-heading", text: "Change password")
+      end
+    end
+
     describe "#password" do
       before do
         get :password
@@ -112,8 +124,8 @@
              }
       end
 
-      it "redirects to the my password page" do
-        expect(response).to redirect_to("/my/password")
+      it "redirects to the security page" do
+        expect(response).to redirect_to(my_security_path)
       end
 
       it "allows the user to login with the new password" do
@@ -230,10 +242,6 @@
       it "renders editable custom fields" do
         expect(response.body).to have_content(custom_field.name)
       end
-
-      it "renders the 'Change password' menu entry" do
-        expect(response.body).to have_css("#menu-sidebar li a", text: "Change password")
-      end
     end
   end
 
@@ -351,14 +359,14 @@
     before do
       allow(OpenProject::Configuration).to receive(:disable_password_login?).and_return(true)
       as_logged_in_user user do
-        get :account
+        get :security
       end
     end
 
     render_views
 
-    it "does not render 'Change password' menu entry" do
-      expect(response.body).to have_no_css("#menu-sidebar li a", text: "Change password")
+    it "does not render 'Change password' section" do
+      expect(response.body).to have_no_css(".Subhead-heading", text: "Change password")
     end
   end
 

spec/lib/redmine/menu_manager_spec.rb

@@ -106,7 +106,7 @@
     context "for the my_menu" do
       it "includes the expected items" do
         expect(described_class.items(:my_menu).map(&:name))
-          .to include(:account, :locale, :password, :access_tokens, :notifications)
+          .to include(:account, :locale, :security, :access_tokens, :notifications)
       end
     end