Add latest changes from gitlab-org/gitlab@master

2 files changed, 7 insertions, 6 deletions

diff --git a/spec/features/admin/users/admin_impersonates_user_spec.rb b/spec/features/admin/users/admin_impersonates_user_spec.rb
index 44b67abcc80..e37b4bf1562 100644
--- a/spec/features/admin/users/admin_impersonates_user_spec.rb
+++ b/spec/features/admin/users/admin_impersonates_user_spec.rb
@@ -53,7 +53,7 @@ RSpec.describe 'Admin impersonates user', feature_category: :user_management do
           it 'does not show impersonate button for admin itself' do
             subject
 
-            expect(page).not_to have_content('Impersonate')
+            expect(page).to have_no_content('Impersonate')
           end
         end
 
@@ -66,7 +66,7 @@ RSpec.describe 'Admin impersonates user', feature_category: :user_management do
         end
 
         context 'for user with expired password' do
-          let(:user_to_visit) do
+          let_it_be(:user_to_visit) do
             another_user.update!(password_expires_at: Time.zone.now - 5.minutes)
             another_user
           end
@@ -113,7 +113,7 @@ RSpec.describe 'Admin impersonates user', feature_category: :user_management do
           it 'does not show impersonate button' do
             subject
 
-            expect(page).not_to have_content('Impersonate')
+            expect(page).to have_no_content('Impersonate')
           end
         end
       end
@@ -145,7 +145,6 @@ RSpec.describe 'Admin impersonates user', feature_category: :user_management do
 
           let_it_be(:another_user) { create(:user, :unconfirmed) }
           let(:warning_alert) { page.find(:css, '[data-testid="alert-warning"]') }
-          let(:expected_styling) { { 'pointer-events' => 'none', 'cursor' => 'default' } }
 
           context 'with an email that does not contain HTML' do
             before do
diff --git a/spec/features/admin/users/admin_manages_user_identities_spec.rb b/spec/features/admin/users/admin_manages_user_identities_spec.rb
index 42d0c2e9ab8..cbb7eed9e1c 100644
--- a/spec/features/admin/users/admin_manages_user_identities_spec.rb
+++ b/spec/features/admin/users/admin_manages_user_identities_spec.rb
@@ -16,8 +16,10 @@ RSpec.describe 'Admin manages user identities', feature_category: :user_manageme
       it 'shows user identities', :aggregate_failures do
         visit admin_user_identities_path(user)
 
-        expect(page).to have_content(user.name)
-        expect(page).to have_content('twitter')
+        expect(page).to(
+          have_content(user.name)
+            .and(have_content('twitter'))
+        )
       end
     end