Merge branch 'master' into add-svg-loader

* master:
  Fix migration without DOWNTIME clause specified
  Fix CSS classes
  fix missing @ symbol
  Update CHANGELOG.md for 8.16.7
  Update CHANGELOG.md for 8.16.7
  Update CHANGELOG.md for 8.16.7
  Make RuboCop happy
  Add development fixtures for nested groups
  Align last column buttons with new environment button
  Removed jQuery UI draggable
  ensure webpack dev server proxy connects regardless of request headers
  Keep consistent in handling indexOf results
  Replace setInterval with setTimeout to prevent highly frequent requests
  Add feature specs for three types of user uploads
  Minor refactoring of Uploaders
  Fix #27840 - Improve the search bar experience on mobile
  Fix false positive caused by non-interpolated string use
  Fix inline comment images by removing wrapper #20890

1 files changed, 24 insertions, 0 deletions

diff --git a/spec/features/uploads/user_uploads_avatar_to_profile_spec.rb b/spec/features/uploads/user_uploads_avatar_to_profile_spec.rb
new file mode 100644
index 00000000000..0dfd29045e5
--- /dev/null
+++ b/spec/features/uploads/user_uploads_avatar_to_profile_spec.rb
@@ -0,0 +1,24 @@
+require 'rails_helper'
+
+feature 'User uploads avatar to profile', feature: true do
+  scenario 'they see their new avatar' do
+    user = create(:user)
+    login_as(user)
+
+    visit profile_path
+    attach_file(
+      'user_avatar',
+      Rails.root.join('spec', 'fixtures', 'dk.png'),
+      visible: false
+    )
+
+    click_button 'Update profile settings'
+
+    visit user_path(user)
+
+    expect(page).to have_selector(%Q(img[src$="/uploads/user/avatar/#{user.id}/dk.png"]))
+
+    # Cheating here to verify something that isn't user-facing, but is important
+    expect(user.reload.avatar.file).to exist
+  end
+end