Merge branch 'master' into qa/gb/selenium-handle-domain-sessions

* master: (694 commits)

Conflicts:
	qa/qa/page/base.rb
	qa/qa/page/main/entry.rb

1 files changed, 8 insertions, 0 deletions

diff --git a/spec/requests/api/users_spec.rb b/spec/requests/api/users_spec.rb
index 2aeae6f9ec7..2428e63e149 100644
--- a/spec/requests/api/users_spec.rb
+++ b/spec/requests/api/users_spec.rb
@@ -510,6 +510,14 @@ describe API::Users do
       expect(user.reload.notification_email).to eq('new@email.com')
     end
 
+    it 'skips reconfirmation when requested' do
+      put api("/users/#{user.id}", admin), { skip_reconfirmation: true }
+
+      user.reload
+
+      expect(user.confirmed_at).to be_present
+    end
+
     it 'updates user with his own username' do
       put api("/users/#{user.id}", admin), username: user.username