Adpat tests to new page structure on MyAccount > security

Author: HDinger

modules/two_factor_authentication/app/components/two_factor_authentication/devices/row_component.rb

@@ -59,6 +59,7 @@ def make_default_button
               tag: :button,
               size: :small,
               type: :submit,
+              test_selector: "two-factor--make-default-button",
               "aria-label": I18n.t(:button_make_default)
             )
           )
@@ -80,6 +81,7 @@ def delete_button
               size: :small,
               type: :submit,
               disabled: deletion_blocked?,
+              test_selector: "two-factor--delete-button",
               "aria-label": if deletion_blocked?
                               I18n.t("two_factor_authentication.devices.is_default_cannot_delete")
                             else

modules/two_factor_authentication/app/components/two_factor_authentication/my/security_section_component.html.erb

@@ -1,19 +1,28 @@
 <%= render(Primer::Beta::Subhead.new(my: 3)) do |subhead|
-  subhead.with_heading(tag: :h3, size: :medium) { t "two_factor_authentication.label_devices" }
-end %>
+      subhead.with_heading(tag: :h3, size: :medium) { t "two_factor_authentication.label_devices" }
+    end %>
 
 <% if @has_remember_token_for_user %>
-  <%= render(Primer::Alpha::Banner.new(scheme: :default, dismiss_scheme: :none, mb: 3,
-                                      id: "two_factor_authentication_remember_cookie")) do |banner|
-        banner.with_action_button(tag: :a,
-                                  href: helpers.my_2fa_remember_cookie_path,
-                                  data: { turbo_method: :delete }) do
+  <%= render(
+        Primer::Alpha::Banner.new(
+          scheme: :default, dismiss_scheme: :none, mb: 3,
+          id: "two_factor_authentication_remember_cookie"
+        )
+      ) do |banner|
+        banner.with_action_button(
+          tag: :a,
+          href: helpers.my_2fa_remember_cookie_path,
+          test_selector: "two-factor-authentication--remove-remember-cookie-link",
+          data: { turbo_method: :delete }
+        ) do
           t("two_factor_authentication.remember.clear_cookie")
         end
 
         if @remember_token
-          t("two_factor_authentication.remember.active_session_notice",
-            expires_on: helpers.format_date(@remember_token.expires_on))
+          t(
+            "two_factor_authentication.remember.active_session_notice",
+            expires_on: helpers.format_date(@remember_token.expires_on)
+          )
         else
           t("two_factor_authentication.remember.other_active_session_notice")
         end
@@ -25,35 +34,37 @@ end %>
 <%= render ::TwoFactorAuthentication::Devices::TableComponent.new(rows: @two_factor_devices, admin_table: false) %>
 
 <%= render(Primer::Alpha::ActionMenu.new(anchor_align: :end)) do |menu|
-  menu.with_show_button(
-    test_selector: "two_factor_authentication_devices_button",
-    aria: { label: t("two_factor_authentication.label_device") },
-    mt: 3
-  ) do |button|
-    button.with_leading_visual_icon(icon: :plus)
-    button.with_trailing_visual_icon(icon: :"triangle-down")
-    t("two_factor_authentication.label_device")
-  end
+      menu.with_show_button(
+        test_selector: "two_factor_authentication_devices_button",
+        aria: { label: t("two_factor_authentication.label_device") },
+        mt: 3
+      ) do |button|
+        button.with_leading_visual_icon(icon: :plus)
+        button.with_trailing_visual_icon(icon: :"triangle-down")
+        t("two_factor_authentication.label_device")
+      end
 
-  @available_devices.each_key do |key|
-    menu.with_item(
-      label: t("two_factor_authentication.devices.#{key}.title"),
-      href: helpers.new_my_2fa_device_path(type: key),
-      test_selector: "two_factor_authentication_devices_#{key}"
-    ) do |item|
-      item.with_description.with_content(t("two_factor_authentication.devices.#{key}.description"))
-    end
-  end
-end %>
+      @available_devices.each_key do |key|
+        menu.with_item(
+          label: t("two_factor_authentication.devices.#{key}.title"),
+          href: helpers.new_my_2fa_device_path(type: key),
+          test_selector: "two_factor_authentication_devices_#{key}"
+        ) do |item|
+          item.with_description.with_content(t("two_factor_authentication.devices.#{key}.description"))
+        end
+      end
+    end %>
 
 <%= render(Primer::Beta::Subhead.new(mt: 5)) do |subhead|
       subhead.with_heading(tag: :h3, size: :medium) { t "two_factor_authentication.backup_codes.plural" }
       subhead.with_description do
-        safe_join([
-          t("two_factor_authentication.backup_codes.overview_description"),
-          tag.br,
-          tag.strong(t("two_factor_authentication.backup_codes.generate.regenerate_warning"))
-        ])
+        safe_join(
+          [
+            t("two_factor_authentication.backup_codes.overview_description"),
+            tag.br,
+            tag.strong(t("two_factor_authentication.backup_codes.generate.regenerate_warning"))
+          ]
+        )
       end
     end %>
 

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/app/views/two_factor_authentication/two_factor_devices/new.html.erb

@@ -24,7 +24,7 @@
 <% if device_form_class %>
   <%= settings_primer_form_with(
         model: @device,
-        as: :device,
+        scope: :device,
         url: { action: :register },
         autocomplete: "off",
         data: {

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/features/admin_delete_two_factor_device_spec.rb

@@ -28,10 +28,10 @@
 
     expect(page).to have_css(".mobile-otp--two-factor-device-row", count: 1)
 
-    find(".two-factor--delete-button").click
+    find_test_selector("two-factor--delete-button").click
     dialog.confirm_flow_with(admin_password)
 
-    expect(page).to have_css(".generic-table--empty-row")
+    expect(page).to have_css(".blankslate")
     expect(other_user.otp_devices.reload).to be_empty
   end
 end

modules/two_factor_authentication/spec/features/admin_edit_two_factor_devices_spec.rb

@@ -22,24 +22,24 @@
     visit edit_user_path(admin, tab: :two_factor_authentication)
     expect(page).to have_css(".on-off-status.-disabled")
 
-    expect(page).to have_no_css(".generic-table--empty-row", wait: 1)
+    expect(page).to have_no_css(".blankslate", wait: 1)
 
     click_link "Two-factor authentication on your account page"
 
-    expect(page).to have_css(".generic-table--empty-row")
+    expect(page).to have_css(".blankslate")
     expect(page).to have_current_path my_security_path
   end
 
   it "allows 2FA device management of the user" do
     visit edit_user_path(other_user, tab: :two_factor_authentication)
 
     # Visit empty index
-    expect(page).to have_css(".generic-table--empty-row",
+    expect(page).to have_css(".blankslate",
                              text: I18n.t("two_factor_authentication.admin.no_devices_for_user"))
     expect(page).to have_css(".on-off-status.-disabled")
 
     # Visit inline create
-    find(".button", text: I18n.t("two_factor_authentication.admin.button_register_mobile_phone_for_user")).click
+    find(".Button", text: I18n.t("two_factor_authentication.admin.button_register_mobile_phone_for_user")).click
 
     SeleniumHubWaiter.wait
     # Try to save with invalid phone number
@@ -53,13 +53,13 @@
     fill_in "device_phone_number", with: "+49 123456789"
     click_button I18n.t(:button_continue)
 
-    expect(page).to have_css(".mobile-otp--two-factor-device-row td", text: "Mobile phone (bob) (+49 123456789)")
-    expect(page).to have_css(".mobile-otp--two-factor-device-row td .icon-yes", count: 2)
+    expect(page).to have_css(".mobile-otp--two-factor-device-row", text: "Mobile phone (bob) (+49 123456789)")
+    expect(page).to have_css(".mobile-otp--two-factor-device-row .octicon-check", count: 2)
     expect(page).to have_css(".on-off-status.-enabled")
 
     SeleniumHubWaiter.wait
     # Delete the one
-    find(".two-factor--delete-button").click
+    find_test_selector("two-factor--delete-button").click
     dialog.confirm_flow_with user_password, should_fail: false
 
     expect(page).to have_css(".mobile-otp--two-factor-device-row", count: 0)
@@ -75,11 +75,11 @@
       visit edit_user_path(other_user, tab: :two_factor_authentication)
       expect(page).to have_css(".mobile-otp--two-factor-device-row", count: 2)
       expect(page).to have_css(".on-off-status.-enabled")
-      find(".button", text: I18n.t("two_factor_authentication.admin.button_delete_all_devices")).click
+      find(".Button", text: I18n.t("two_factor_authentication.admin.button_delete_all_devices")).click
 
       page.driver.browser.switch_to.alert.accept
 
-      expect(page).to have_css(".generic-table--empty-row",
+      expect(page).to have_css(".blankslate",
                                text: I18n.t("two_factor_authentication.admin.no_devices_for_user"), wait: 20)
       expect(page).to have_css(".on-off-status.-disabled")
     end

modules/two_factor_authentication/spec/features/backup_codes/generate_backup_codes_spec.rb

@@ -29,12 +29,12 @@
     end
 
     # Confirm with wrong password
-    expect(page).to have_css("h2", text: I18n.t("two_factor_authentication.backup_codes.plural"))
+    expect(page).to have_css(".Subhead-heading", text: I18n.t("two_factor_authentication.backup_codes.plural"))
     click_on I18n.t("two_factor_authentication.backup_codes.generate.title")
     dialog.confirm_flow_with "wrong_password", should_fail: true
 
     # Confirm with correct password
-    expect(page).to have_css("h2", text: I18n.t("two_factor_authentication.backup_codes.plural"))
+    expect(page).to have_css(".Subhead-heading", text: I18n.t("two_factor_authentication.backup_codes.plural"))
     click_on I18n.t("two_factor_authentication.backup_codes.generate.title")
     dialog.confirm_flow_with user_password, should_fail: false
 

modules/two_factor_authentication/spec/features/my_two_factor_devices_spec.rb

@@ -25,7 +25,7 @@
   it "allows 2FA device management" do
     # Visit empty index
     visit my_security_path
-    expect(page).to have_css(".generic-table--empty-row", text: I18n.t("two_factor_authentication.devices.not_existing"))
+    expect(page).to have_css(".blankslate", text: I18n.t("two_factor_authentication.devices.not_existing"))
     expect(page).to have_css(".on-off-status.-disabled")
 
     # Select SMS
@@ -69,8 +69,8 @@
     click_button I18n.t(:button_continue)
 
     # Assert that it exists and is default
-    expect(page).to have_css(".mobile-otp--two-factor-device-row td", text: "Mobile phone (bob) (+49 123456789)")
-    expect(page).to have_css(".mobile-otp--two-factor-device-row td .icon-yes", count: 2)
+    expect(page).to have_css(".mobile-otp--two-factor-device-row", text: "Mobile phone (bob) (+49 123456789)")
+    expect(page).to have_css(".mobile-otp--two-factor-device-row .octicon-check", count: 2)
     expect(page).to have_css(".on-off-status.-enabled")
 
     # Create another one as totp
@@ -104,46 +104,46 @@
 
     expect(page).to have_css(".mobile-otp--two-factor-device-row", count: 2)
     rows = page.all(".mobile-otp--two-factor-device-row")
-    expect(rows[0]).to have_css(".mobile-otp--two-factor-device-row td .icon-yes", count: 2)
-    expect(rows[1]).to have_css(".mobile-otp--two-factor-device-row td", text: "custom identifier")
-    expect(rows[1]).to have_css(".mobile-otp--two-factor-device-row td .icon-yes", count: 1)
+    expect(rows[0]).to have_css(".octicon-check", count: 2)
+    expect(rows[1]).to have_text("custom identifier")
+    expect(rows[1]).to have_css(".octicon-check", count: 1)
 
     device.reload
     expect(device.active).to be_truthy
     expect(device.default).to be_falsey
 
     # Make the second one the default
     # Confirm the password wrongly
-    find(".two-factor--mark-default-button").click
+    page.find_test_selector("two-factor--make-default-button").click
     dialog.confirm_flow_with "wrong_password", should_fail: true
 
     # Confirm again
-    find(".two-factor--mark-default-button").click
+    page.find_test_selector("two-factor--make-default-button").click
     dialog.confirm_flow_with user_password, should_fail: false
 
     expect_and_dismiss_flash(message: "Successful update")
 
     expect(page).to have_css(".mobile-otp--two-factor-device-row", count: 2)
     rows = page.all(".mobile-otp--two-factor-device-row")
-    expect(rows[0]).to have_css(".mobile-otp--two-factor-device-row td .icon-yes", count: 1)
-    expect(rows[1]).to have_css(".mobile-otp--two-factor-device-row td .icon-yes", count: 2)
+    expect(rows[0]).to have_css(".octicon-check", count: 1)
+    expect(rows[1]).to have_css(".octicon-check", count: 2)
 
     device.reload
     expect(device.default).to be_truthy
 
     # Delete the sms device
-    rows[0].find(".two-factor--delete-button").click
+    rows[0].find("[data-test-selector='two-factor--delete-button']").click
     dialog.confirm_flow_with user_password, should_fail: false
 
     expect(page).to have_css(".mobile-otp--two-factor-device-row", count: 1)
     expect(page).to have_css(".on-off-status.-enabled")
     expect(user.otp_devices.count).to eq 1
 
     # Delete the totp device
-    find(".two-factor--delete-button").click
+    page.find_test_selector("two-factor--delete-button").click
     dialog.confirm_flow_with user_password, should_fail: false
 
-    expect(page).to have_css(".generic-table--empty-row", text: I18n.t("two_factor_authentication.devices.not_existing"))
+    expect(page).to have_css(".blankslate", text: I18n.t("two_factor_authentication.devices.not_existing"))
     expect(page).to have_css(".on-off-status.-disabled")
     expect(user.otp_devices.count).to eq 0
   end

modules/two_factor_authentication/spec/features/remember_cookie/login_with_remember_cookie_spec.rb

@@ -65,9 +65,9 @@ def expect_no_autologin
       login_with_cookie
       visit my_security_path
 
-      find(".two-factor-authentication--remove-remember-cookie-link").click
+      find_test_selector("two-factor-authentication--remove-remember-cookie-link").click
       expect_flash(message: I18n.t("two_factor_authentication.remember.cookie_removed"))
-      expect(page).to have_no_css(".two-factor-authentication--remove-remember-cookie-link")
+      expect(page).to have_no_test_selector("two-factor-authentication--remove-remember-cookie-link")
 
       # Log out and in again
       visit "/logout"